@webiny/api-page-builder-import-export 0.0.0-unstable.ecd8734205 → 0.0.0-unstable.f9f12f52a0

package/client.d.ts

@@ -1,4 +1,4 @@
-import { PbImportExportContext } from "./graphql/types";
+import type { PbImportExportContext } from "./graphql/types";
 export interface InvokeHandlerClientParams<TParams> {
     context: PbImportExportContext;
     name: string;

package/client.js

@@ -1,43 +1,34 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.invokeHandlerClient = invokeHandlerClient;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 async function invokeHandlerClient({
   context,
   name,
   payload,
   description
 }) {
-  /*
-   * Prepare "invocationArgs", we're hacking our wat here.
-   * They are necessary to setup the "context.pageBuilder" object among other things in IMPORT_PAGE_FUNCTION
-   */
   const {
     request
   } = context;
   const tenantId = context.tenancy.getCurrentTenant().id;
-  const headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, request.headers), {}, {
-    ["x-tenant"]: request.headers["x-tenant"] || tenantId
-  });
-  delete headers["content-length"];
-  const invocationArgs = {
-    httpMethod: request.method,
-    body: request.body,
-    headers,
-    /**
-     * Required until type augmentation works correctly.
-     */
-    cookies: request.cookies
-  };
+
   // Invoke handler
   await context.handlerClient.invoke({
     name: name,
-    payload: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, payload), invocationArgs),
+    payload: {
+      ...payload,
+      httpMethod: request.method,
+      headers: {
+        ["x-i18n-locale"]: request.headers["x-i18n-locale"],
+        ["x-tenant"]: request.headers["x-tenant"] || tenantId
+      }
+    },
     await: false,
     description
   });
-}
+}
+
+//# sourceMappingURL=client.js.map

package/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["invokeHandlerClient","context","name","payload","description","request","tenantId","tenancy","getCurrentTenant","id","headers","invocationArgs","httpMethod","method","body","cookies","handlerClient","invoke","await"],"sources":["client.ts"],"sourcesContent":["import { PbImportExportContext } from \"~/graphql/types\";\n\nexport interface InvokeHandlerClientParams<TParams> {\n    context: PbImportExportContext;\n    name: string;\n    payload: TParams;\n    description: string;\n}\n\nexport async function invokeHandlerClient<TParams>({\n    context,\n    name,\n    payload,\n    description\n}: InvokeHandlerClientParams<TParams>) {\n    /*\n     * Prepare \"invocationArgs\", we're hacking our wat here.\n     * They are necessary to setup the \"context.pageBuilder\" object among other things in IMPORT_PAGE_FUNCTION\n     */\n    const { request } = context;\n\n    const tenantId = context.tenancy.getCurrentTenant().id;\n\n    const headers = {\n        ...request.headers,\n        [\"x-tenant\"]: request.headers[\"x-tenant\"] || tenantId\n    };\n    delete headers[\"content-length\"];\n    const invocationArgs = {\n        httpMethod: request.method,\n        body: request.body,\n        headers,\n        /**\n         * Required until type augmentation works correctly.\n         */\n        cookies: (request as any).cookies\n    };\n    // Invoke handler\n    await context.handlerClient.invoke<TParams & any>({\n        name: name,\n        payload: {\n            ...payload,\n            ...invocationArgs\n        },\n        await: false,\n        description\n    });\n}\n"],"mappings":";;;;;;;;AASO,eAAeA,mBAAmB,CAAU;EAC/CC,OAAO;EACPC,IAAI;EACJC,OAAO;EACPC;AACgC,CAAC,EAAE;EACnC;AACJ;AACA;AACA;EACI,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,OAAO;EAE3B,MAAMK,QAAQ,GAAGL,OAAO,CAACM,OAAO,CAACC,gBAAgB,EAAE,CAACC,EAAE;EAEtD,MAAMC,OAAO,+DACNL,OAAO,CAACK,OAAO;IAClB,CAAC,UAAU,GAAGL,OAAO,CAACK,OAAO,CAAC,UAAU,CAAC,IAAIJ;EAAQ,EACxD;EACD,OAAOI,OAAO,CAAC,gBAAgB,CAAC;EAChC,MAAMC,cAAc,GAAG;IACnBC,UAAU,EAAEP,OAAO,CAACQ,MAAM;IAC1BC,IAAI,EAAET,OAAO,CAACS,IAAI;IAClBJ,OAAO;IACP;AACR;AACA;IACQK,OAAO,EAAGV,OAAO,CAASU;EAC9B,CAAC;EACD;EACA,MAAMd,OAAO,CAACe,aAAa,CAACC,MAAM,CAAgB;IAC9Cf,IAAI,EAAEA,IAAI;IACVC,OAAO,8DACAA,OAAO,GACPQ,cAAc,CACpB;IACDO,KAAK,EAAE,KAAK;IACZd;EACJ,CAAC,CAAC;AACN"}
+{"version":3,"names":["invokeHandlerClient","context","name","payload","description","request","tenantId","tenancy","getCurrentTenant","id","handlerClient","invoke","httpMethod","method","headers","await"],"sources":["client.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/graphql/types\";\n\nexport interface InvokeHandlerClientParams<TParams> {\n    context: PbImportExportContext;\n    name: string;\n    payload: TParams;\n    description: string;\n}\n\nexport async function invokeHandlerClient<TParams>({\n    context,\n    name,\n    payload,\n    description\n}: InvokeHandlerClientParams<TParams>) {\n    const { request } = context;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n\n    // Invoke handler\n    await context.handlerClient.invoke<TParams & any>({\n        name: name,\n        payload: {\n            ...payload,\n            httpMethod: request.method,\n            headers: {\n                [\"x-i18n-locale\"]: request.headers[\"x-i18n-locale\"],\n                [\"x-tenant\"]: request.headers[\"x-tenant\"] || tenantId\n            }\n        },\n        await: false,\n        description\n    });\n}\n"],"mappings":";;;;;;AASO,eAAeA,mBAAmBA,CAAU;EAC/CC,OAAO;EACPC,IAAI;EACJC,OAAO;EACPC;AACgC,CAAC,EAAE;EACnC,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,OAAO;EAC3B,MAAMK,QAAQ,GAAGL,OAAO,CAACM,OAAO,CAACC,gBAAgB,CAAC,CAAC,CAACC,EAAE;;EAEtD;EACA,MAAMR,OAAO,CAACS,aAAa,CAACC,MAAM,CAAgB;IAC9CT,IAAI,EAAEA,IAAI;IACVC,OAAO,EAAE;MACL,GAAGA,OAAO;MACVS,UAAU,EAAEP,OAAO,CAACQ,MAAM;MAC1BC,OAAO,EAAE;QACL,CAAC,eAAe,GAAGT,OAAO,CAACS,OAAO,CAAC,eAAe,CAAC;QACnD,CAAC,UAAU,GAAGT,OAAO,CAACS,OAAO,CAAC,UAAU,CAAC,IAAIR;MACjD;IACJ,CAAC;IACDS,KAAK,EAAE,KAAK;IACZX;EACJ,CAAC,CAAC;AACN","ignoreList":[]}

package/export/combine/blocksHandler.d.ts

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

package/export/combine/blocksHandler.js

@@ -61,7 +61,7 @@ const blocksHandler = async (payload, context) => {
       data: {
         message: `Finish uploading block export.`,
         key: blockExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(blockExportUpload.Key)
+        url: await _s3Stream.s3Stream.getPresignedUrl(blockExportUpload.Key)
       }
     });
 
@@ -96,4 +96,6 @@ const blocksHandler = async (payload, context) => {
     error: null
   };
 };
-exports.blocksHandler = blocksHandler;
+exports.blocksHandler = blocksHandler;
+
+//# sourceMappingURL=blocksHandler.js.map

package/export/combine/blocksHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["blocksHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportBlocksDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","blockExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code"],"sources":["blocksHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export blocks combine workflow.\n */\nexport const blocksHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Blocks Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportBlocksDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportBlocksDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining blocks.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportBlocksDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_BLOCK_EXPORT.zip\");\n\n        // Upload\n        const blockExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${blockExportUpload.Location} `);\n\n        // Update task status and save export blocks data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading block export.`,\n                key: blockExportUpload.Key,\n                url: s3Stream.getPresignedUrl(blockExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_BLOCKS_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_types","require","_s3Stream","_zipper","_mockSecurity","blocksHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportBlocksDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","blockExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code","exports"],"sources":["blocksHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ImportExportTaskStatus } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export blocks combine workflow.\n */\nexport const blocksHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Blocks Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportBlocksDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportBlocksDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining blocks.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportBlocksDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_BLOCK_EXPORT.zip\");\n\n        // Upload\n        const blockExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${blockExportUpload.Location} `);\n\n        // Update task status and save export blocks data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading block export.`,\n                key: blockExportUpload.Key,\n                url: await s3Stream.getPresignedUrl(blockExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_BLOCKS_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AAGA;AACA;AACA;AACO,MAAMI,aAAa,GAAG,MAAAA,CACzBC,OAAgB,EAChBC,OAA8B,KACV;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;EAEvBA,GAAG,CAAC,uCAAuC,CAAC;EAC5C,MAAM;IAAEE;EAAY,CAAC,GAAGH,OAAO;EAC/B,MAAM;IAAEI,MAAM;IAAEC;EAAS,CAAC,GAAGN,OAAO;EAEpC,IAAAO,0BAAY,EAACD,QAAQ,EAAEL,OAAO,CAAC;EAE/B,IAAI;IACA,MAAMO,IAAI,GAAG,MAAMJ,WAAW,CAACK,gBAAgB,CAACC,OAAO,CAACL,MAAM,CAAC;IAC/D,IAAI,CAACG,IAAI,EAAE;MACP,OAAO;QACHG,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAE,6BAA6BR,MAAM;QAChD;MACJ,CAAC;IACL;IAEA,MAAM;MAAES;IAAoB,CAAC,GAAGN,IAAI,CAACO,KAAK;;IAE1C;IACA,MAAMC,kBAAkB,GAAG,MAAMC,kBAAQ,CAACC,UAAU,CAACJ,mBAAmB,CAAC;IACzE,IAAI,CAACE,kBAAkB,CAACG,QAAQ,EAAE;MAC9B,OAAO;QACHR,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAE;QACb;MACJ,CAAC;IACL;IAEA,MAAMO,WAAW,GAAGJ,kBAAkB,CAACG,QAAQ,CAACE,MAAM,CAClDC,IAAI,IAAIA,IAAI,CAACC,GAAG,KAAKT,mBACzB,CAAC,CACIU,GAAG,CAACF,IAAI,IAAIA,IAAI,CAACC,GAAG,CAAC,CACrBF,MAAM,CAACI,OAAO,CAAa;;IAEhC;IACA,MAAMC,QAAQ,GAAG,IAAIC,gBAAQ,CAACP,WAAW,EAAE,yBAAyB,CAAC;;IAErE;IACA,MAAMQ,iBAAiB,GAAG,MAAMF,QAAQ,CAACG,OAAO,CAAC,CAAC;IAClD3B,GAAG,CAAC,wCAAwC0B,iBAAiB,CAACE,QAAQ,GAAG,CAAC;;IAE1E;IACA,MAAM1B,WAAW,CAACK,gBAAgB,CAACsB,UAAU,CAAC1B,MAAM,EAAE;MAClD2B,MAAM,EAAEC,6BAAsB,CAACC,SAAS;MACxCvB,IAAI,EAAE;QACFE,OAAO,EAAE,gCAAgC;QACzCsB,GAAG,EAAEP,iBAAiB,CAACL,GAAG;QAC1Ba,GAAG,EAAE,MAAMnB,kBAAQ,CAACoB,eAAe,CAACT,iBAAiB,CAACL,GAAG;MAC7D;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMe,kBAAkB,GAAGlB,WAAW,CAACI,GAAG,CAACW,GAAG,IAAIlB,kBAAQ,CAACsB,YAAY,CAACJ,GAAG,CAAC,CAAC;IAC7E,MAAMK,OAAO,CAACC,GAAG,CAACH,kBAAkB,CAAC;IACrCpC,GAAG,CAAC,wBAAwBoC,kBAAkB,CAACI,MAAM,aAAa,CAAC;EACvE,CAAC,CAAC,OAAOC,CAAC,EAAE;IACRzC,GAAG,CAAC,mCAAmC,EAAEyC,CAAC,CAAC9B,OAAO,CAAC;;IAEnD;AACR;AACA;AACA;IACQ,MAAMT,WAAW,CAACK,gBAAgB,CAACsB,UAAU,CAAC1B,MAAM,EAAE;MAClD2B,MAAM,EAAEC,6BAAsB,CAACW,MAAM;MACrChC,KAAK,EAAE;QACHiC,IAAI,EAAEF,CAAC,CAACE,IAAI;QACZhC,OAAO,EAAE8B,CAAC,CAAC9B,OAAO;QAClBiC,IAAI,EAAE;MACV;IACJ,CAAC,CAAC;IAEF,OAAO;MACHnC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAE8B,CAAC,CAAC9B;MACf;IACJ,CAAC;EACL;EACA,OAAO;IACHF,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE;EACX,CAAC;AACL,CAAC;AAACmC,OAAA,CAAAhD,aAAA,GAAAA,aAAA","ignoreList":[]}

package/export/combine/formsHandler.d.ts

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

package/export/combine/formsHandler.js

@@ -61,7 +61,7 @@ const formsHandler = async (payload, context) => {
       data: {
         message: `Finish uploading form export.`,
         key: formExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(formExportUpload.Key)
+        url: await _s3Stream.s3Stream.getPresignedUrl(formExportUpload.Key)
       }
     });
 
@@ -96,4 +96,6 @@ const formsHandler = async (payload, context) => {
     error: null
   };
 };
-exports.formsHandler = formsHandler;
+exports.formsHandler = formsHandler;
+
+//# sourceMappingURL=formsHandler.js.map

package/export/combine/formsHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["formsHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportFormsDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","formExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code"],"sources":["formsHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export forms combine workflow.\n */\nexport const formsHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Forms Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportFormsDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportFormsDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining forms.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportFormsDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_FORM_EXPORT.zip\");\n\n        // Upload\n        const formExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${formExportUpload.Location} `);\n\n        // Update task status and save export form data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading form export.`,\n                key: formExportUpload.Key,\n                url: s3Stream.getPresignedUrl(formExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_FORMS_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_types","require","_s3Stream","_zipper","_mockSecurity","formsHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportFormsDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","formExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code","exports"],"sources":["formsHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ImportExportTaskStatus } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export forms combine workflow.\n */\nexport const formsHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Forms Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportFormsDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportFormsDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining forms.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportFormsDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_FORM_EXPORT.zip\");\n\n        // Upload\n        const formExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${formExportUpload.Location} `);\n\n        // Update task status and save export form data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading form export.`,\n                key: formExportUpload.Key,\n                url: await s3Stream.getPresignedUrl(formExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_FORMS_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/export/combine/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 Payload {
     taskId: string;
     type: string;

package/export/combine/index.js

@@ -7,7 +7,6 @@ exports.default = void 0;
 var _handlerAws = require("@webiny/handler-aws");
 var _blocksHandler = require("./blocksHandler");
 var _formsHandler = require("./formsHandler");
-var _pagesHandler = require("./pagesHandler");
 var _templatesHandler = require("./templatesHandler");
 /**
  * Handles the export pages combine workflow.
@@ -17,24 +16,29 @@ var _default = () => {
     payload,
     context
   }) => {
-    switch (payload.type) {
-      case "block":
-        {
-          return await (0, _blocksHandler.blocksHandler)(payload, context);
-        }
-      case "form":
-        {
-          return await (0, _formsHandler.formsHandler)(payload, context);
-        }
-      case "template":
-        {
-          return await (0, _templatesHandler.templatesHandler)(payload, context);
-        }
-      default:
-        {
-          return await (0, _pagesHandler.pagesHandler)(payload, context);
-        }
-    }
+    return context.security.withoutAuthorization(() => {
+      switch (payload.type) {
+        case "block":
+          {
+            return (0, _blocksHandler.blocksHandler)(payload, context);
+          }
+        case "form":
+          {
+            return (0, _formsHandler.formsHandler)(payload, context);
+          }
+        case "template":
+          {
+            return (0, _templatesHandler.templatesHandler)(payload, context);
+          }
+        default:
+          {
+            console.log("Export PB combine", JSON.stringify(payload));
+            throw new Error("Invalid type provided: pb combine.");
+          }
+      }
+    });
   });
 };
-exports.default = _default;
+exports.default = _default;
+
+//# sourceMappingURL=index.js.map

package/export/combine/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createRawEventHandler","payload","context","type","blocksHandler","formsHandler","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/combine/blocksHandler\";\nimport { formsHandler } from \"~/export/combine/formsHandler\";\nimport { pagesHandler } from \"~/export/combine/pagesHandler\";\nimport { templatesHandler } from \"~/export/combine/templatesHandler\";\n\nexport interface Payload {\n    taskId: string;\n    type: string;\n    identity: SecurityIdentity;\n}\n\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\n/**\n * Handles the export pages combine workflow.\n */\nexport default () => {\n    return createRawEventHandler<Payload, PbImportExportContext, Response>(\n        async ({ payload, context }) => {\n            switch (payload.type) {\n                case \"block\": {\n                    return await blocksHandler(payload, context);\n                }\n                case \"form\": {\n                    return await formsHandler(payload, context);\n                }\n                case \"template\": {\n                    return await templatesHandler(payload, context);\n                }\n                default: {\n                    return await pagesHandler(payload, context);\n                }\n            }\n        }\n    );\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AAFA,eAGe,MAAM;EACjB,OAAO,IAAAA,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,QAAQD,OAAO,CAACE,IAAI;MAChB,KAAK,OAAO;QAAE;UACV,OAAO,MAAM,IAAAC,4BAAa,EAACH,OAAO,EAAEC,OAAO,CAAC;QAChD;MACA,KAAK,MAAM;QAAE;UACT,OAAO,MAAM,IAAAG,0BAAY,EAACJ,OAAO,EAAEC,OAAO,CAAC;QAC/C;MACA,KAAK,UAAU;QAAE;UACb,OAAO,MAAM,IAAAI,kCAAgB,EAACL,OAAO,EAAEC,OAAO,CAAC;QACnD;MACA;QAAS;UACL,OAAO,MAAM,IAAAK,0BAAY,EAACN,OAAO,EAAEC,OAAO,CAAC;QAC/C;IAAC;EAET,CAAC,CACJ;AACL,CAAC;AAAA"}
+{"version":3,"names":["_handlerAws","require","_blocksHandler","_formsHandler","_templatesHandler","_default","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/combine/blocksHandler\";\nimport { formsHandler } from \"~/export/combine/formsHandler\";\nimport { templatesHandler } from \"~/export/combine/templatesHandler\";\n\nexport interface Payload {\n    taskId: string;\n    type: string;\n    identity: SecurityIdentity;\n}\n\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\n/**\n * Handles the export pages combine workflow.\n */\nexport default () => {\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(payload, context);\n                    }\n                    case \"form\": {\n                        return formsHandler(payload, context);\n                    }\n                    case \"template\": {\n                        return templatesHandler(payload, context);\n                    }\n                    default: {\n                        console.log(\"Export PB combine\", JSON.stringify(payload));\n                        throw new Error(\"Invalid type provided: pb combine.\");\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;AAaA;AACA;AACA;AAFA,IAAAI,QAAA,GAGeA,CAAA,KAAM;EACjB,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,EAACL,OAAO,EAAEC,OAAO,CAAC;UAC1C;QACA,KAAK,MAAM;UAAE;YACT,OAAO,IAAAK,0BAAY,EAACN,OAAO,EAAEC,OAAO,CAAC;UACzC;QACA,KAAK,UAAU;UAAE;YACb,OAAO,IAAAM,kCAAgB,EAACP,OAAO,EAAEC,OAAO,CAAC;UAC7C;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,GAAAhB,QAAA","ignoreList":[]}

package/export/combine/templatesHandler.d.ts

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

package/export/combine/templatesHandler.js

@@ -61,7 +61,7 @@ const templatesHandler = async (payload, context) => {
       data: {
         message: `Finish uploading template export.`,
         key: templateExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(templateExportUpload.Key)
+        url: await _s3Stream.s3Stream.getPresignedUrl(templateExportUpload.Key)
       }
     });
 
@@ -96,4 +96,6 @@ const templatesHandler = async (payload, context) => {
     error: null
   };
 };
-exports.templatesHandler = templatesHandler;
+exports.templatesHandler = templatesHandler;
+
+//# sourceMappingURL=templatesHandler.js.map

package/export/combine/templatesHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["templatesHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportTemplatesDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","templateExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export templates combine workflow.\n */\nexport const templatesHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Templates Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportTemplatesDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportTemplatesDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining templates.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportTemplatesDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_TEMPLATE_EXPORT.zip\");\n\n        // Upload\n        const templateExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${templateExportUpload.Location} `);\n\n        // Update task status and save export templates data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading template export.`,\n                key: templateExportUpload.Key,\n                url: s3Stream.getPresignedUrl(templateExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_types","require","_s3Stream","_zipper","_mockSecurity","templatesHandler","payload","context","log","console","pageBuilder","taskId","identity","mockSecurity","task","importExportTask","getTask","data","error","message","exportTemplatesDataKey","input","listObjectResponse","s3Stream","listObject","Contents","zipFileKeys","filter","file","Key","map","Boolean","zipOfZip","ZipOfZip","templateExportUpload","process","Location","updateTask","status","ImportExportTaskStatus","COMPLETED","key","url","getPresignedUrl","deleteFilePromises","deleteObject","Promise","all","length","e","FAILED","name","code","exports"],"sources":["templatesHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ImportExportTaskStatus } from \"~/types\";\nimport { s3Stream } from \"../s3Stream\";\nimport { ZipOfZip } from \"../zipper\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { Payload, Response } from \"~/export/combine\";\n\n/**\n * Handles the export templates combine workflow.\n */\nexport const templatesHandler = async (\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n\n    log(\"RUNNING Export Templates Combine Handler\");\n    const { pageBuilder } = context;\n    const { taskId, identity } = payload;\n\n    mockSecurity(identity, context);\n\n    try {\n        const task = await pageBuilder.importExportTask.getTask(taskId);\n        if (!task) {\n            return {\n                data: null,\n                error: {\n                    message: `There is no task with ID \"${taskId}\".`\n                }\n            };\n        }\n\n        const { exportTemplatesDataKey } = task.input;\n\n        // Get all files (zip) from given key\n        const listObjectResponse = await s3Stream.listObject(exportTemplatesDataKey);\n        if (!listObjectResponse.Contents) {\n            return {\n                data: null,\n                error: {\n                    message: \"There is no Contents defined on S3 Stream while combining templates.\"\n                }\n            };\n        }\n\n        const zipFileKeys = listObjectResponse.Contents.filter(\n            file => file.Key !== exportTemplatesDataKey\n        )\n            .map(file => file.Key)\n            .filter(Boolean) as string[];\n\n        // Prepare zip of all zips\n        const zipOfZip = new ZipOfZip(zipFileKeys, \"WEBINY_TEMPLATE_EXPORT.zip\");\n\n        // Upload\n        const templateExportUpload = await zipOfZip.process();\n        log(`Done uploading... File is located at ${templateExportUpload.Location} `);\n\n        // Update task status and save export templates data key\n        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading template export.`,\n                key: templateExportUpload.Key,\n                url: await s3Stream.getPresignedUrl(templateExportUpload.Key)\n            }\n        });\n\n        // Remove individual zip files from storage\n        const deleteFilePromises = zipFileKeys.map(key => s3Stream.deleteObject(key));\n        await Promise.all(deleteFilePromises);\n        log(`Successfully deleted ${deleteFilePromises.length} zip files.`);\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_COMBINE] Error => \", e.message);\n\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        await pageBuilder.importExportTask.updateTask(taskId, {\n            status: ImportExportTaskStatus.FAILED,\n            error: {\n                name: e.name,\n                message: e.message,\n                code: \"EXPORT_FAILED\"\n            }\n        });\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AAGA;AACA;AACA;AACO,MAAMI,gBAAgB,GAAG,MAAAA,CAC5BC,OAAgB,EAChBC,OAA8B,KACV;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;EAEvBA,GAAG,CAAC,0CAA0C,CAAC;EAC/C,MAAM;IAAEE;EAAY,CAAC,GAAGH,OAAO;EAC/B,MAAM;IAAEI,MAAM;IAAEC;EAAS,CAAC,GAAGN,OAAO;EAEpC,IAAAO,0BAAY,EAACD,QAAQ,EAAEL,OAAO,CAAC;EAE/B,IAAI;IACA,MAAMO,IAAI,GAAG,MAAMJ,WAAW,CAACK,gBAAgB,CAACC,OAAO,CAACL,MAAM,CAAC;IAC/D,IAAI,CAACG,IAAI,EAAE;MACP,OAAO;QACHG,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAE,6BAA6BR,MAAM;QAChD;MACJ,CAAC;IACL;IAEA,MAAM;MAAES;IAAuB,CAAC,GAAGN,IAAI,CAACO,KAAK;;IAE7C;IACA,MAAMC,kBAAkB,GAAG,MAAMC,kBAAQ,CAACC,UAAU,CAACJ,sBAAsB,CAAC;IAC5E,IAAI,CAACE,kBAAkB,CAACG,QAAQ,EAAE;MAC9B,OAAO;QACHR,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAE;QACb;MACJ,CAAC;IACL;IAEA,MAAMO,WAAW,GAAGJ,kBAAkB,CAACG,QAAQ,CAACE,MAAM,CAClDC,IAAI,IAAIA,IAAI,CAACC,GAAG,KAAKT,sBACzB,CAAC,CACIU,GAAG,CAACF,IAAI,IAAIA,IAAI,CAACC,GAAG,CAAC,CACrBF,MAAM,CAACI,OAAO,CAAa;;IAEhC;IACA,MAAMC,QAAQ,GAAG,IAAIC,gBAAQ,CAACP,WAAW,EAAE,4BAA4B,CAAC;;IAExE;IACA,MAAMQ,oBAAoB,GAAG,MAAMF,QAAQ,CAACG,OAAO,CAAC,CAAC;IACrD3B,GAAG,CAAC,wCAAwC0B,oBAAoB,CAACE,QAAQ,GAAG,CAAC;;IAE7E;IACA,MAAM1B,WAAW,CAACK,gBAAgB,CAACsB,UAAU,CAAC1B,MAAM,EAAE;MAClD2B,MAAM,EAAEC,6BAAsB,CAACC,SAAS;MACxCvB,IAAI,EAAE;QACFE,OAAO,EAAE,mCAAmC;QAC5CsB,GAAG,EAAEP,oBAAoB,CAACL,GAAG;QAC7Ba,GAAG,EAAE,MAAMnB,kBAAQ,CAACoB,eAAe,CAACT,oBAAoB,CAACL,GAAG;MAChE;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMe,kBAAkB,GAAGlB,WAAW,CAACI,GAAG,CAACW,GAAG,IAAIlB,kBAAQ,CAACsB,YAAY,CAACJ,GAAG,CAAC,CAAC;IAC7E,MAAMK,OAAO,CAACC,GAAG,CAACH,kBAAkB,CAAC;IACrCpC,GAAG,CAAC,wBAAwBoC,kBAAkB,CAACI,MAAM,aAAa,CAAC;EACvE,CAAC,CAAC,OAAOC,CAAC,EAAE;IACRzC,GAAG,CAAC,sCAAsC,EAAEyC,CAAC,CAAC9B,OAAO,CAAC;;IAEtD;AACR;AACA;AACA;IACQ,MAAMT,WAAW,CAACK,gBAAgB,CAACsB,UAAU,CAAC1B,MAAM,EAAE;MAClD2B,MAAM,EAAEC,6BAAsB,CAACW,MAAM;MACrChC,KAAK,EAAE;QACHiC,IAAI,EAAEF,CAAC,CAACE,IAAI;QACZhC,OAAO,EAAE8B,CAAC,CAAC9B,OAAO;QAClBiC,IAAI,EAAE;MACV;IACJ,CAAC,CAAC;IAEF,OAAO;MACHnC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAE8B,CAAC,CAAC9B;MACf;IACJ,CAAC;EACL;EACA,OAAO;IACHF,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE;EACX,CAAC;AACL,CAAC;AAACmC,OAAA,CAAAhD,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/export/pages/ExportPagesCleanup.d.ts

@@ -0,0 +1,5 @@
+import type { IExportPagesCleanupTaskParams } from "./types";
+import type { ITaskResponseResult } from "@webiny/tasks";
+export declare class ExportPagesCleanup {
+    execute(params: IExportPagesCleanupTaskParams): Promise<ITaskResponseResult>;
+}

package/export/pages/ExportPagesCleanup.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ExportPagesCleanup = void 0;
+var _types = require("./types");
+var _clientS = require("@webiny/aws-sdk/client-s3");
+var _chunk = _interopRequireDefault(require("lodash/chunk"));
+class ExportPagesCleanup {
+  async execute(params) {
+    const {
+      context,
+      response,
+      store
+    } = params;
+    /**
+     * This task must have a parent one. If it does not, just end with error.
+     * This should not happen as we trigger this task from a parent one, not directly.
+     *
+     * But let's just make sure.
+     */
+    const task = store.getTask();
+    if (!task.parentId) {
+      return response.error(`Missing task "${task.id}" parent id.`);
+    }
+    const parent = await context.tasks.getTask(task.parentId);
+    if (!parent) {
+      return response.error(`Missing parent task "${task.parentId}" in the database.`);
+    }
+    /**
+     * We need to find all the tasks that created zip files, so we can have a list of files to delete.
+     */
+    const {
+      items: subTasks
+    } = await context.tasks.listTasks({
+      where: {
+        parentId: parent.id,
+        definitionId: _types.PageExportTask.ZipPages
+      },
+      limit: 10000
+    });
+    if (subTasks.length === 0) {
+      return response.done("No subtasks found - nothing to cleanup.");
+    }
+    const files = subTasks.reduce((collection, subTask) => {
+      const done = subTask.output?.done;
+      if (!done) {
+        return collection;
+      }
+      const results = Object.values(done).filter(Boolean);
+      collection.push(...results);
+      return collection;
+    }, []);
+    const s3 = (0, _clientS.createS3)({
+      region: process.env.AWS_REGION
+    });
+    const parentKey = parent.output?.key;
+    if (typeof parentKey === "string") {
+      await s3.deleteObject({
+        Bucket: process.env.S3_BUCKET,
+        Key: parentKey
+      });
+    }
+    const chunks = (0, _chunk.default)(files, 500);
+    for (const chunk of chunks) {
+      await s3.deleteObjects({
+        Bucket: process.env.S3_BUCKET,
+        Delete: {
+          Objects: chunk.map(Key => ({
+            Key
+          }))
+        }
+      });
+    }
+    return response.done("Done with cleanup!");
+  }
+}
+exports.ExportPagesCleanup = ExportPagesCleanup;
+
+//# sourceMappingURL=ExportPagesCleanup.js.map

package/export/pages/ExportPagesCleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_clientS","_chunk","_interopRequireDefault","ExportPagesCleanup","execute","params","context","response","store","task","getTask","parentId","error","id","parent","tasks","items","subTasks","listTasks","where","definitionId","PageExportTask","ZipPages","limit","length","done","files","reduce","collection","subTask","output","results","Object","values","filter","Boolean","push","s3","createS3","region","process","env","AWS_REGION","parentKey","key","deleteObject","Bucket","S3_BUCKET","Key","chunks","lodashChunk","chunk","deleteObjects","Delete","Objects","map","exports"],"sources":["ExportPagesCleanup.ts"],"sourcesContent":["import type {\n    IExportPagesCleanupTaskParams,\n    IExportPagesControllerOutput,\n    IExportPagesZipPagesOutput\n} from \"~/export/pages/types\";\nimport { PageExportTask } from \"~/export/pages/types\";\nimport type { ITaskResponseResult } from \"@webiny/tasks\";\nimport { createS3 } from \"@webiny/aws-sdk/client-s3\";\nimport lodashChunk from \"lodash/chunk\";\n\nexport class ExportPagesCleanup {\n    public async execute(params: IExportPagesCleanupTaskParams): Promise<ITaskResponseResult> {\n        const { context, response, store } = params;\n        /**\n         * This task must have a parent one. If it does not, just end with error.\n         * This should not happen as we trigger this task from a parent one, not directly.\n         *\n         * But let's just make sure.\n         */\n        const task = store.getTask();\n        if (!task.parentId) {\n            return response.error(`Missing task \"${task.id}\" parent id.`);\n        }\n\n        const parent = await context.tasks.getTask<IExportPagesControllerOutput>(task.parentId);\n        if (!parent) {\n            return response.error(`Missing parent task \"${task.parentId}\" in the database.`);\n        }\n        /**\n         * We need to find all the tasks that created zip files, so we can have a list of files to delete.\n         */\n        const { items: subTasks } = await context.tasks.listTasks<any, IExportPagesZipPagesOutput>({\n            where: {\n                parentId: parent.id,\n                definitionId: PageExportTask.ZipPages\n            },\n            limit: 10000\n        });\n        if (subTasks.length === 0) {\n            return response.done(\"No subtasks found - nothing to cleanup.\");\n        }\n\n        const files = subTasks.reduce<string[]>((collection, subTask) => {\n            const done = subTask.output?.done;\n            if (!done) {\n                return collection;\n            }\n            const results = Object.values(done).filter(Boolean);\n            collection.push(...results);\n            return collection;\n        }, []);\n\n        const s3 = createS3({\n            region: process.env.AWS_REGION\n        });\n\n        const parentKey = parent.output?.key;\n        if (typeof parentKey === \"string\") {\n            await s3.deleteObject({\n                Bucket: process.env.S3_BUCKET,\n                Key: parentKey\n            });\n        }\n\n        const chunks = lodashChunk(files, 500);\n\n        for (const chunk of chunks) {\n            await s3.deleteObjects({\n                Bucket: process.env.S3_BUCKET,\n                Delete: {\n                    Objects: chunk.map(Key => ({ Key }))\n                }\n            });\n        }\n\n        return response.done(\"Done with cleanup!\");\n    }\n}\n"],"mappings":";;;;;;;AAKA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEO,MAAMI,kBAAkB,CAAC;EAC5B,MAAaC,OAAOA,CAACC,MAAqC,EAAgC;IACtF,MAAM;MAAEC,OAAO;MAAEC,QAAQ;MAAEC;IAAM,CAAC,GAAGH,MAAM;IAC3C;AACR;AACA;AACA;AACA;AACA;IACQ,MAAMI,IAAI,GAAGD,KAAK,CAACE,OAAO,CAAC,CAAC;IAC5B,IAAI,CAACD,IAAI,CAACE,QAAQ,EAAE;MAChB,OAAOJ,QAAQ,CAACK,KAAK,CAAC,iBAAiBH,IAAI,CAACI,EAAE,cAAc,CAAC;IACjE;IAEA,MAAMC,MAAM,GAAG,MAAMR,OAAO,CAACS,KAAK,CAACL,OAAO,CAA+BD,IAAI,CAACE,QAAQ,CAAC;IACvF,IAAI,CAACG,MAAM,EAAE;MACT,OAAOP,QAAQ,CAACK,KAAK,CAAC,wBAAwBH,IAAI,CAACE,QAAQ,oBAAoB,CAAC;IACpF;IACA;AACR;AACA;IACQ,MAAM;MAAEK,KAAK,EAAEC;IAAS,CAAC,GAAG,MAAMX,OAAO,CAACS,KAAK,CAACG,SAAS,CAAkC;MACvFC,KAAK,EAAE;QACHR,QAAQ,EAAEG,MAAM,CAACD,EAAE;QACnBO,YAAY,EAAEC,qBAAc,CAACC;MACjC,CAAC;MACDC,KAAK,EAAE;IACX,CAAC,CAAC;IACF,IAAIN,QAAQ,CAACO,MAAM,KAAK,CAAC,EAAE;MACvB,OAAOjB,QAAQ,CAACkB,IAAI,CAAC,yCAAyC,CAAC;IACnE;IAEA,MAAMC,KAAK,GAAGT,QAAQ,CAACU,MAAM,CAAW,CAACC,UAAU,EAAEC,OAAO,KAAK;MAC7D,MAAMJ,IAAI,GAAGI,OAAO,CAACC,MAAM,EAAEL,IAAI;MACjC,IAAI,CAACA,IAAI,EAAE;QACP,OAAOG,UAAU;MACrB;MACA,MAAMG,OAAO,GAAGC,MAAM,CAACC,MAAM,CAACR,IAAI,CAAC,CAACS,MAAM,CAACC,OAAO,CAAC;MACnDP,UAAU,CAACQ,IAAI,CAAC,GAAGL,OAAO,CAAC;MAC3B,OAAOH,UAAU;IACrB,CAAC,EAAE,EAAE,CAAC;IAEN,MAAMS,EAAE,GAAG,IAAAC,iBAAQ,EAAC;MAChBC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;IACxB,CAAC,CAAC;IAEF,MAAMC,SAAS,GAAG7B,MAAM,CAACgB,MAAM,EAAEc,GAAG;IACpC,IAAI,OAAOD,SAAS,KAAK,QAAQ,EAAE;MAC/B,MAAMN,EAAE,CAACQ,YAAY,CAAC;QAClBC,MAAM,EAAEN,OAAO,CAACC,GAAG,CAACM,SAAS;QAC7BC,GAAG,EAAEL;MACT,CAAC,CAAC;IACN;IAEA,MAAMM,MAAM,GAAG,IAAAC,cAAW,EAACxB,KAAK,EAAE,GAAG,CAAC;IAEtC,KAAK,MAAMyB,KAAK,IAAIF,MAAM,EAAE;MACxB,MAAMZ,EAAE,CAACe,aAAa,CAAC;QACnBN,MAAM,EAAEN,OAAO,CAACC,GAAG,CAACM,SAAS;QAC7BM,MAAM,EAAE;UACJC,OAAO,EAAEH,KAAK,CAACI,GAAG,CAACP,GAAG,KAAK;YAAEA;UAAI,CAAC,CAAC;QACvC;MACJ,CAAC,CAAC;IACN;IAEA,OAAOzC,QAAQ,CAACkB,IAAI,CAAC,oBAAoB,CAAC;EAC9C;AACJ;AAAC+B,OAAA,CAAArD,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/export/pages/ExportPagesController.d.ts

@@ -0,0 +1,5 @@
+import type { IExportPagesControllerTaskParams } from "./types";
+import type { ITaskResponseResult } from "@webiny/tasks";
+export declare class ExportPagesController {
+    execute(params: IExportPagesControllerTaskParams): Promise<ITaskResponseResult>;
+}

package/export/pages/ExportPagesController.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ExportPagesController = void 0;
+var _ProcessZipPagesTasks = require("./controller/ProcessZipPagesTasks");
+var _CreateZipPagesTasks = require("./controller/CreateZipPagesTasks");
+class ExportPagesController {
+  async execute(params) {
+    const {
+      input
+    } = params;
+    /**
+     * In case subtasks for zipping pages are already created, we need to wait for them to finish.
+     * After they are done, we can combine all zip files into a single one.
+     */
+    if (input.zippingPages) {
+      const processZipPagesTasks = new _ProcessZipPagesTasks.ProcessZipPagesTasks();
+      return await processZipPagesTasks.execute(params);
+    }
+    /**
+     * On the first run of the task, we need to create subtasks for zipping pages in batches.
+     */
+    const createZipPagesTasks = new _CreateZipPagesTasks.CreateZipPagesTasks();
+    return await createZipPagesTasks.execute(params);
+  }
+}
+exports.ExportPagesController = ExportPagesController;
+
+//# sourceMappingURL=ExportPagesController.js.map

package/export/pages/ExportPagesController.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_ProcessZipPagesTasks","require","_CreateZipPagesTasks","ExportPagesController","execute","params","input","zippingPages","processZipPagesTasks","ProcessZipPagesTasks","createZipPagesTasks","CreateZipPagesTasks","exports"],"sources":["ExportPagesController.ts"],"sourcesContent":["import type { IExportPagesControllerTaskParams } from \"./types\";\nimport type { ITaskResponseResult } from \"@webiny/tasks\";\nimport { ProcessZipPagesTasks } from \"./controller/ProcessZipPagesTasks\";\nimport { CreateZipPagesTasks } from \"./controller/CreateZipPagesTasks\";\n\nexport class ExportPagesController {\n    public async execute(params: IExportPagesControllerTaskParams): Promise<ITaskResponseResult> {\n        const { input } = params;\n        /**\n         * In case subtasks for zipping pages are already created, we need to wait for them to finish.\n         * After they are done, we can combine all zip files into a single one.\n         */\n        if (input.zippingPages) {\n            const processZipPagesTasks = new ProcessZipPagesTasks();\n            return await processZipPagesTasks.execute(params);\n        }\n        /**\n         * On the first run of the task, we need to create subtasks for zipping pages in batches.\n         */\n        const createZipPagesTasks = new CreateZipPagesTasks();\n        return await createZipPagesTasks.execute(params);\n    }\n}\n"],"mappings":";;;;;;AAEA,IAAAA,qBAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAEO,MAAME,qBAAqB,CAAC;EAC/B,MAAaC,OAAOA,CAACC,MAAwC,EAAgC;IACzF,MAAM;MAAEC;IAAM,CAAC,GAAGD,MAAM;IACxB;AACR;AACA;AACA;IACQ,IAAIC,KAAK,CAACC,YAAY,EAAE;MACpB,MAAMC,oBAAoB,GAAG,IAAIC,0CAAoB,CAAC,CAAC;MACvD,OAAO,MAAMD,oBAAoB,CAACJ,OAAO,CAACC,MAAM,CAAC;IACrD;IACA;AACR;AACA;IACQ,MAAMK,mBAAmB,GAAG,IAAIC,wCAAmB,CAAC,CAAC;IACrD,OAAO,MAAMD,mBAAmB,CAACN,OAAO,CAACC,MAAM,CAAC;EACpD;AACJ;AAACO,OAAA,CAAAT,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/export/pages/ExportPagesZipPages.d.ts

@@ -0,0 +1,5 @@
+import type { IExportPagesZipPagesTaskParams } from "./types";
+import type { ITaskResponseResult } from "@webiny/tasks";
+export declare class ExportPagesZipPages {
+    execute(params: IExportPagesZipPagesTaskParams): Promise<ITaskResponseResult>;
+}

package/export/pages/ExportPagesZipPages.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ExportPagesZipPages = void 0;
+var _ZipPages = require("./zipPages/ZipPages");
+class ExportPagesZipPages {
+  async execute(params) {
+    const {
+      isAborted,
+      response
+    } = params;
+    if (isAborted()) {
+      return response.aborted();
+    }
+    const zipPages = new _ZipPages.ZipPages();
+    return await zipPages.execute(params);
+  }
+}
+exports.ExportPagesZipPages = ExportPagesZipPages;
+
+//# sourceMappingURL=ExportPagesZipPages.js.map

package/export/pages/ExportPagesZipPages.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_ZipPages","require","ExportPagesZipPages","execute","params","isAborted","response","aborted","zipPages","ZipPages","exports"],"sources":["ExportPagesZipPages.ts"],"sourcesContent":["import type { IExportPagesZipPagesTaskParams } from \"~/export/pages/types\";\nimport type { ITaskResponseResult } from \"@webiny/tasks\";\nimport { ZipPages } from \"./zipPages/ZipPages\";\n\nexport class ExportPagesZipPages {\n    public async execute(params: IExportPagesZipPagesTaskParams): Promise<ITaskResponseResult> {\n        const { isAborted, response } = params;\n        if (isAborted()) {\n            return response.aborted();\n        }\n\n        const zipPages = new ZipPages();\n        return await zipPages.execute(params);\n    }\n}\n"],"mappings":";;;;;;AAEA,IAAAA,SAAA,GAAAC,OAAA;AAEO,MAAMC,mBAAmB,CAAC;EAC7B,MAAaC,OAAOA,CAACC,MAAsC,EAAgC;IACvF,MAAM;MAAEC,SAAS;MAAEC;IAAS,CAAC,GAAGF,MAAM;IACtC,IAAIC,SAAS,CAAC,CAAC,EAAE;MACb,OAAOC,QAAQ,CAACC,OAAO,CAAC,CAAC;IAC7B;IAEA,MAAMC,QAAQ,GAAG,IAAIC,kBAAQ,CAAC,CAAC;IAC/B,OAAO,MAAMD,QAAQ,CAACL,OAAO,CAACC,MAAM,CAAC;EACzC;AACJ;AAACM,OAAA,CAAAR,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/export/pages/controller/CombineZippedPages.d.ts

@@ -0,0 +1,5 @@
+import type { IExportPagesCombineZippedPagesParams } from "../types";
+import type { ITaskResponseResult } from "@webiny/tasks";
+export declare class CombineZippedPages {
+    execute(params: IExportPagesCombineZippedPagesParams): Promise<ITaskResponseResult>;
+}

package/export/pages/controller/CombineZippedPages.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CombineZippedPages = void 0;
+var _s3Stream = require("../../s3Stream");
+var _utils = require("../utils");
+var _ZipFiles = require("../../../utils/ZipFiles");
+var _uniqid = _interopRequireDefault(require("uniqid"));
+class CombineZippedPages {
+  async execute(params) {
+    const {
+      response,
+      store
+    } = params;
+    /**
+     * We need to get all the subtasks of the PageExportTask.ZipPages type, so we can get all the zip files and combine them into one.
+     * Current task must have a parent for this to work.
+     */
+    const taskId = store.getTask().id;
+
+    /**
+     * When we have all the pages IDs and their zip files, we can continue to combine the zip files into one.
+     */
+    const exportPagesDataKey = (0, _utils.createExportPagesDataKey)(taskId);
+    let listObjectResponse;
+    try {
+      listObjectResponse = await _s3Stream.s3Stream.listObject(exportPagesDataKey);
+      if (!Array.isArray(listObjectResponse.Contents)) {
+        return response.error({
+          message: "There is no Contents defined on S3 Stream while combining pages."
+        });
+      } else if (listObjectResponse.Contents.length === 0) {
+        return response.done("No zip files to combine.");
+      }
+    } catch (ex) {
+      return response.error(ex);
+    }
+    const zipFileKeys = listObjectResponse.Contents.reduce((files, file) => {
+      if (!file.Key) {
+        return files;
+      } else if (file.Key === exportPagesDataKey) {
+        return files;
+      }
+      files.push(file.Key);
+      return files;
+    }, []);
+    let key;
+    try {
+      const zipOfZip = new _ZipFiles.ZipFiles();
+      const target = (0, _uniqid.default)("EXPORTS/", "-WEBINY_PAGE_EXPORT.zip");
+      const pageExportUpload = await zipOfZip.process(target, zipFileKeys);
+      if (!pageExportUpload?.Key) {
+        return response.error({
+          message: "There is no Key defined on pageExportUpload."
+        });
+      }
+      key = pageExportUpload.Key;
+    } catch (ex) {
+      console.error(`Error while combining zip files into a single zip: ${ex.message}`);
+      console.log(ex);
+      return response.error(ex);
+    }
+    const url = await _s3Stream.s3Stream.getPresignedUrl(key);
+    return response.done("Done combining pages.", {
+      key,
+      url
+    });
+  }
+}
+exports.CombineZippedPages = CombineZippedPages;
+
+//# sourceMappingURL=CombineZippedPages.js.map