@webiny/api-page-builder-import-export 0.0.0-unstable.3386f66516 → 0.0.0-unstable.3bc8100a7f

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,47 +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
 
+  // 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,mBAAf,CAA4C;EAC/CC,OAD+C;EAE/CC,IAF+C;EAG/CC,OAH+C;EAI/CC;AAJ+C,CAA5C,EAKgC;EACnC;AACJ;AACA;AACA;EACI,MAAM;IAAEC;EAAF,IAAcJ,OAApB;EAEA,MAAMK,QAAQ,GAAGL,OAAO,CAACM,OAAR,CAAgBC,gBAAhB,GAAmCC,EAApD;EAEA,MAAMC,OAAO,+DACNL,OAAO,CAACK,OADF;IAET,CAAC,UAAD,GAAcL,OAAO,CAACK,OAAR,CAAgB,UAAhB,KAA+BJ;EAFpC,EAAb;EAIA,OAAOI,OAAO,CAAC,gBAAD,CAAd;EACA,MAAMC,cAAc,GAAG;IACnBC,UAAU,EAAEP,OAAO,CAACQ,MADD;IAEnBC,IAAI,EAAET,OAAO,CAACS,IAFK;IAGnBJ,OAHmB;;IAInB;AACR;AACA;IACQK,OAAO,EAAGV,OAAD,CAAiBU;EAPP,CAAvB,CAdmC,CAuBnC;;EACA,MAAMd,OAAO,CAACe,aAAR,CAAsBC,MAAtB,CAA4C;IAC9Cf,IAAI,EAAEA,IADwC;IAE9CC,OAAO,8DACAA,OADA,GAEAQ,cAFA,CAFuC;IAM9CO,KAAK,EAAE,KANuC;IAO9Cd;EAP8C,CAA5C,CAAN;AASH"}
+{"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

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blocksHandler = void 0;
-
 var _types = require("../../types");
-
 var _s3Stream = require("../s3Stream");
-
 var _zipper = require("../zipper");
-
 var _mockSecurity = require("../../mockSecurity");
-
 /**
  * Handles the export blocks combine workflow.
  */
@@ -27,10 +22,8 @@ const blocksHandler = async (payload, context) => {
     identity
   } = payload;
   (0, _mockSecurity.mockSecurity)(identity, context);
-
   try {
     const task = await pageBuilder.importExportTask.getTask(taskId);
-
     if (!task) {
       return {
         data: null,
@@ -39,13 +32,12 @@ const blocksHandler = async (payload, context) => {
         }
       };
     }
-
     const {
       exportBlocksDataKey
-    } = task.input; // Get all files (zip) from given key
+    } = task.input;
 
+    // Get all files (zip) from given key
     const listObjectResponse = await _s3Stream.s3Stream.listObject(exportBlocksDataKey);
-
     if (!listObjectResponse.Contents) {
       return {
         data: null,
@@ -54,33 +46,36 @@ const blocksHandler = async (payload, context) => {
         }
       };
     }
+    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportBlocksDataKey).map(file => file.Key).filter(Boolean);
 
-    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportBlocksDataKey).map(file => file.Key).filter(Boolean); // Prepare zip of all zips
-
-    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_BLOCK_EXPORT.zip"); // Upload
+    // Prepare zip of all zips
+    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_BLOCK_EXPORT.zip");
 
+    // Upload
     const blockExportUpload = await zipOfZip.process();
-    log(`Done uploading... File is located at ${blockExportUpload.Location} `); // Update task status and save export blocks data key
+    log(`Done uploading... File is located at ${blockExportUpload.Location} `);
 
+    // Update task status and save export blocks data key
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.COMPLETED,
       data: {
         message: `Finish uploading block export.`,
         key: blockExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(blockExportUpload.Key)
+        url: await _s3Stream.s3Stream.getPresignedUrl(blockExportUpload.Key)
       }
-    }); // Remove individual zip files from storage
+    });
 
+    // Remove individual zip files from storage
     const deleteFilePromises = zipFileKeys.map(key => _s3Stream.s3Stream.deleteObject(key));
     await Promise.all(deleteFilePromises);
     log(`Successfully deleted ${deleteFilePromises.length} zip files.`);
   } catch (e) {
     log("[EXPORT_BLOCKS_COMBINE] Error => ", e.message);
+
     /**
      * In case of error, we'll update the task status to "failed",
      * so that, client can show notify the user appropriately.
      */
-
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.FAILED,
       error: {
@@ -96,11 +91,11 @@ const blocksHandler = async (payload, context) => {
       }
     };
   }
-
   return {
     data: "",
     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":"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","ignoreList":[]}

package/export/combine/formsHandler.d.ts

@@ -0,0 +1,6 @@
+import type { PbImportExportContext } from "../../types";
+import type { Payload, Response } from "./";
+/**
+ * Handles the export forms combine workflow.
+ */
+export declare const formsHandler: (payload: Payload, context: PbImportExportContext) => Promise<Response>;

package/export/combine/{pagesHandler.js → formsHandler.js}

@@ -3,22 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pagesHandler = void 0;
-
+exports.formsHandler = void 0;
 var _types = require("../../types");
-
 var _s3Stream = require("../s3Stream");
-
 var _zipper = require("../zipper");
-
 var _mockSecurity = require("../../mockSecurity");
-
 /**
- * Handles the export pages combine workflow.
+ * Handles the export forms combine workflow.
  */
-const pagesHandler = async (payload, context) => {
+const formsHandler = async (payload, context) => {
   const log = console.log;
-  log("RUNNING Export Pages Combine Handler");
+  log("RUNNING Export Forms Combine Handler");
   const {
     pageBuilder
   } = context;
@@ -27,10 +22,8 @@ const pagesHandler = async (payload, context) => {
     identity
   } = payload;
   (0, _mockSecurity.mockSecurity)(identity, context);
-
   try {
     const task = await pageBuilder.importExportTask.getTask(taskId);
-
     if (!task) {
       return {
         data: null,
@@ -39,48 +32,50 @@ const pagesHandler = async (payload, context) => {
         }
       };
     }
-
     const {
-      exportPagesDataKey
-    } = task.input; // Get all files (zip) from given key
-
-    const listObjectResponse = await _s3Stream.s3Stream.listObject(exportPagesDataKey);
+      exportFormsDataKey
+    } = task.input;
 
+    // Get all files (zip) from given key
+    const listObjectResponse = await _s3Stream.s3Stream.listObject(exportFormsDataKey);
     if (!listObjectResponse.Contents) {
       return {
         data: null,
         error: {
-          message: "There is no Contents defined on S3 Stream while combining pages."
+          message: "There is no Contents defined on S3 Stream while combining forms."
         }
       };
     }
+    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportFormsDataKey).map(file => file.Key).filter(Boolean);
 
-    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportPagesDataKey).map(file => file.Key).filter(Boolean); // Prepare zip of all zips
+    // Prepare zip of all zips
+    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_FORM_EXPORT.zip");
 
-    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_PAGE_EXPORT.zip"); // Upload
-
-    const pageExportUpload = await zipOfZip.process();
-    log(`Done uploading... File is located at ${pageExportUpload.Location} `); // Update task status and save export page data key
+    // Upload
+    const formExportUpload = await zipOfZip.process();
+    log(`Done uploading... File is located at ${formExportUpload.Location} `);
 
+    // Update task status and save export form data key
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.COMPLETED,
       data: {
-        message: `Finish uploading page export.`,
-        key: pageExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(pageExportUpload.Key)
+        message: `Finish uploading form export.`,
+        key: formExportUpload.Key,
+        url: await _s3Stream.s3Stream.getPresignedUrl(formExportUpload.Key)
       }
-    }); // Remove individual zip files from storage
+    });
 
+    // Remove individual zip files from storage
     const deleteFilePromises = zipFileKeys.map(key => _s3Stream.s3Stream.deleteObject(key));
     await Promise.all(deleteFilePromises);
     log(`Successfully deleted ${deleteFilePromises.length} zip files.`);
   } catch (e) {
-    log("[EXPORT_PAGES_COMBINE] Error => ", e.message);
+    log("[EXPORT_FORMS_COMBINE] Error => ", e.message);
+
     /**
      * In case of error, we'll update the task status to "failed",
      * so that, client can show notify the user appropriately.
      */
-
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.FAILED,
       error: {
@@ -96,11 +91,11 @@ const pagesHandler = async (payload, context) => {
       }
     };
   }
-
   return {
     data: "",
     error: null
   };
 };
+exports.formsHandler = formsHandler;
 
-exports.pagesHandler = pagesHandler;
+//# sourceMappingURL=formsHandler.js.map

package/export/combine/formsHandler.js.map

@@ -0,0 +1 @@
+{"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

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
-
 /**
  * Handles the export pages combine workflow.
  */
@@ -21,23 +16,29 @@ var _default = () => {
     payload,
     context
   }) => {
-    switch (payload.type) {
-      case "block":
-        {
-          return await (0, _blocksHandler.blocksHandler)(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","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 { 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 \"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;;AAaA;AACA;AACA;eACe,MAAM;EACjB,OAAO,IAAAA,iCAAA,EACH,OAAO;IAAEC,OAAF;IAAWC;EAAX,CAAP,KAAgC;IAC5B,QAAQD,OAAO,CAACE,IAAhB;MACI,KAAK,OAAL;QAAc;UACV,OAAO,MAAM,IAAAC,4BAAA,EAAcH,OAAd,EAAuBC,OAAvB,CAAb;QACH;;MACD,KAAK,UAAL;QAAiB;UACb,OAAO,MAAM,IAAAG,kCAAA,EAAiBJ,OAAjB,EAA0BC,OAA1B,CAAb;QACH;;MACD;QAAS;UACL,OAAO,MAAM,IAAAI,0BAAA,EAAaL,OAAb,EAAsBC,OAAtB,CAAb;QACH;IATL;EAWH,CAbE,CAAP;AAeH,C"}
+{"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

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.templatesHandler = void 0;
-
 var _types = require("../../types");
-
 var _s3Stream = require("../s3Stream");
-
 var _zipper = require("../zipper");
-
 var _mockSecurity = require("../../mockSecurity");
-
 /**
  * Handles the export templates combine workflow.
  */
@@ -27,10 +22,8 @@ const templatesHandler = async (payload, context) => {
     identity
   } = payload;
   (0, _mockSecurity.mockSecurity)(identity, context);
-
   try {
     const task = await pageBuilder.importExportTask.getTask(taskId);
-
     if (!task) {
       return {
         data: null,
@@ -39,13 +32,12 @@ const templatesHandler = async (payload, context) => {
         }
       };
     }
-
     const {
       exportTemplatesDataKey
-    } = task.input; // Get all files (zip) from given key
+    } = task.input;
 
+    // Get all files (zip) from given key
     const listObjectResponse = await _s3Stream.s3Stream.listObject(exportTemplatesDataKey);
-
     if (!listObjectResponse.Contents) {
       return {
         data: null,
@@ -54,33 +46,36 @@ const templatesHandler = async (payload, context) => {
         }
       };
     }
+    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportTemplatesDataKey).map(file => file.Key).filter(Boolean);
 
-    const zipFileKeys = listObjectResponse.Contents.filter(file => file.Key !== exportTemplatesDataKey).map(file => file.Key).filter(Boolean); // Prepare zip of all zips
-
-    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_TEMPLATE_EXPORT.zip"); // Upload
+    // Prepare zip of all zips
+    const zipOfZip = new _zipper.ZipOfZip(zipFileKeys, "WEBINY_TEMPLATE_EXPORT.zip");
 
+    // Upload
     const templateExportUpload = await zipOfZip.process();
-    log(`Done uploading... File is located at ${templateExportUpload.Location} `); // Update task status and save export templates data key
+    log(`Done uploading... File is located at ${templateExportUpload.Location} `);
 
+    // Update task status and save export templates data key
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.COMPLETED,
       data: {
         message: `Finish uploading template export.`,
         key: templateExportUpload.Key,
-        url: _s3Stream.s3Stream.getPresignedUrl(templateExportUpload.Key)
+        url: await _s3Stream.s3Stream.getPresignedUrl(templateExportUpload.Key)
       }
-    }); // Remove individual zip files from storage
+    });
 
+    // Remove individual zip files from storage
     const deleteFilePromises = zipFileKeys.map(key => _s3Stream.s3Stream.deleteObject(key));
     await Promise.all(deleteFilePromises);
     log(`Successfully deleted ${deleteFilePromises.length} zip files.`);
   } catch (e) {
     log("[EXPORT_TEMPLATES_COMBINE] Error => ", e.message);
+
     /**
      * In case of error, we'll update the task status to "failed",
      * so that, client can show notify the user appropriately.
      */
-
     await pageBuilder.importExportTask.updateTask(taskId, {
       status: _types.ImportExportTaskStatus.FAILED,
       error: {
@@ -96,11 +91,11 @@ const templatesHandler = async (payload, context) => {
       }
     };
   }
-
   return {
     data: "",
     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":"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","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>;
+}