@webiny/api-page-builder-import-export 0.0.0-unstable.8c4d9f045a → 0.0.0-unstable.8feaff8c32

package/import/process/blocks/blocksHandler.js

@@ -0,0 +1,168 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.blocksHandler = void 0;
+var _types = require("../../../types");
+var _client = require("../../../client");
+var _mockSecurity = require("../../../mockSecurity");
+var _utils = require("@webiny/utils");
+var _importBlock = require("./importBlock");
+const blocksHandler = async (configuration, payload, context) => {
+  const log = console.log;
+  let subTask;
+  let noPendingTask = true;
+  let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
+  log("RUNNING Import Block Queue Process");
+  const {
+    pageBuilder
+  } = context;
+  const {
+    taskId,
+    subTaskIndex,
+    type,
+    identity
+  } = payload;
+  // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
+  // and this Lambda is invoked internally, without credentials.
+  (0, _mockSecurity.mockSecurity)(identity, context);
+  try {
+    /*
+     * Note: We're not going to DB for getting next sub-task to process,
+     * because the data might be out of sync due to GSI eventual consistency.
+     */
+
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
+
+    /**
+     * Base condition!!
+     * Bail out early, if task not found or task's status is not "pending".
+     */
+    if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
+      noPendingTask = true;
+      return {
+        data: "",
+        error: null
+      };
+    } else {
+      noPendingTask = false;
+    }
+    prevStatusOfSubTask = subTask.status;
+    log(`Fetched sub task => ${subTask.id}`);
+    console.log("subTask", subTask);
+    const {
+      blockKey,
+      zipFileKey,
+      input
+    } = subTask.data;
+    const {
+      fileUploadsData
+    } = input;
+    log(`Processing block key "${blockKey}"`);
+
+    // Mark task status as PROCESSING
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.PROCESSING
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.PROCESSING
+    });
+    prevStatusOfSubTask = subTask.status;
+
+    // Real job
+    const block = await (0, _importBlock.importBlock)({
+      context,
+      blockKey,
+      key: zipFileKey,
+      fileUploadsData
+    });
+
+    // Create a block
+    const pbBlock = await context.pageBuilder.createPageBlock({
+      name: block.name,
+      blockCategory: block.blockCategory,
+      content: block.content,
+      preview: block.preview
+    });
+
+    // Update task record in DB
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.COMPLETED,
+      data: {
+        message: "Done",
+        block: {
+          id: pbBlock.id,
+          name: pbBlock.name
+        }
+      }
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.COMPLETED
+    });
+    prevStatusOfSubTask = subTask.status;
+  } catch (e) {
+    log("[IMPORT_BLOCKS_PROCESS] Error => ", e.message);
+    if (subTask && subTask.id) {
+      /**
+       * In case of error, we'll update the task status to "failed",
+       * so that, client can show notify the user appropriately.
+       */
+      subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+        status: _types.ImportExportTaskStatus.FAILED,
+        error: {
+          name: e.name,
+          message: e.message,
+          code: "IMPORT_FAILED"
+        }
+      });
+
+      // Update stats in main task
+      await pageBuilder.importExportTask.updateStats(taskId, {
+        prevStatus: prevStatusOfSubTask,
+        nextStatus: _types.ImportExportTaskStatus.FAILED
+      });
+      prevStatusOfSubTask = subTask.status;
+    }
+    return {
+      data: null,
+      error: {
+        message: e.message
+      }
+    };
+  } finally {
+    // Base condition!
+    if (noPendingTask) {
+      log(`No pending sub-task for task ${taskId}`);
+      await pageBuilder.importExportTask.updateTask(taskId, {
+        status: _types.ImportExportTaskStatus.COMPLETED,
+        data: {
+          message: `Finish importing blocks.`
+        }
+      });
+    } else {
+      log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
+      // We want to continue with Self invocation no matter if current block error out.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.process,
+        payload: {
+          taskId,
+          subTaskIndex: subTaskIndex + 1,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Import blocks - process - subtask"
+      });
+    }
+  }
+  return {
+    data: "",
+    error: null
+  };
+};
+exports.blocksHandler = blocksHandler;

package/import/process/blocks/blocksHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_client","_mockSecurity","_utils","_importBlock","blocksHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","blockKey","zipFileKey","input","fileUploadsData","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","block","importBlock","key","pbBlock","createPageBlock","name","blockCategory","content","preview","COMPLETED","message","e","FAILED","code","updateTask","invokeHandlerClient","handlers","process","security","getIdentity","description","exports"],"sources":["blocksHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/process\";\nimport { importBlock } from \"./importBlock\";\n\nexport const blocksHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Import Block Queue Process\");\n    const { pageBuilder } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity, context);\n\n    try {\n        /*\n         * Note: We're not going to DB for getting next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Fetched sub task => ${subTask.id}`);\n        console.log(\"subTask\", subTask);\n\n        const { blockKey, zipFileKey, input } = subTask.data;\n        const { fileUploadsData } = input;\n\n        log(`Processing block key \"${blockKey}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        // Real job\n        const block = await importBlock({\n            context,\n            blockKey,\n            key: zipFileKey,\n            fileUploadsData\n        });\n\n        // Create a block\n        const pbBlock = await context.pageBuilder.createPageBlock({\n            name: block.name,\n            blockCategory: block.blockCategory,\n            content: block.content,\n            preview: block.preview\n        });\n\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: \"Done\",\n                block: {\n                    id: pbBlock.id,\n                    name: pbBlock.name\n                }\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[IMPORT_BLOCKS_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"IMPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n\n            await pageBuilder.importExportTask.updateTask(taskId, {\n                status: ImportExportTaskStatus.COMPLETED,\n                data: {\n                    message: `Finish importing blocks.`\n                }\n            });\n        } else {\n            log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current block error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Import blocks - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}

package/import/process/blocks/importBlock.d.ts

@@ -0,0 +1,11 @@
+import { PbImportExportContext } from "../../../graphql/types";
+import { FileUploadsData } from "../../../types";
+import { PageBlock } from "@webiny/api-page-builder/types";
+interface ImportBlockParams {
+    key: string;
+    blockKey: string;
+    context: PbImportExportContext;
+    fileUploadsData: FileUploadsData;
+}
+export declare function importBlock({ blockKey, context, fileUploadsData }: ImportBlockParams): Promise<Pick<PageBlock, "name" | "content" | "preview" | "blockCategory">>;
+export {};

package/import/process/blocks/importBlock.js

@@ -0,0 +1,106 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.importBlock = importBlock;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _path = _interopRequireDefault(require("path"));
+var _dotPropImmutable = _interopRequireDefault(require("dot-prop-immutable"));
+var _loadJsonFile = _interopRequireDefault(require("load-json-file"));
+var _fsExtra = require("fs-extra");
+var _s3Stream = require("../../../export/s3Stream");
+var _uploadAssets = require("../../utils/uploadAssets");
+var _downloadInstallFiles = require("@webiny/api-page-builder/graphql/crud/install/utils/downloadInstallFiles");
+var _deleteS3Folder = require("../../utils/deleteS3Folder");
+var _updateFilesInData = require("../../utils/updateFilesInData");
+var _constants = require("../../constants");
+async function importBlock({
+  blockKey,
+  context,
+  fileUploadsData
+}) {
+  const log = console.log;
+
+  // Making Directory for block in which we're going to extract the block data file.
+  const BLOCK_EXTRACT_DIR = _path.default.join(_constants.INSTALL_EXTRACT_DIR, blockKey);
+  (0, _fsExtra.ensureDirSync)(BLOCK_EXTRACT_DIR);
+  const blockDataFileKey = _dotPropImmutable.default.get(fileUploadsData, `data`);
+  const BLOCK_DATA_FILE_PATH = _path.default.join(BLOCK_EXTRACT_DIR, _path.default.basename(blockDataFileKey));
+  log(`Downloading Block data file: ${blockDataFileKey} at "${BLOCK_DATA_FILE_PATH}"`);
+  // Download and save block data file in disk.
+  await new Promise((resolve, reject) => {
+    _s3Stream.s3Stream.readStream(blockDataFileKey).on("error", reject).pipe((0, _fsExtra.createWriteStream)(BLOCK_DATA_FILE_PATH)).on("error", reject).on("finish", resolve);
+  });
+
+  // Load the block data file from disk.
+  log(`Load file ${blockDataFileKey}`);
+  const {
+    block,
+    category,
+    files
+  } = await (0, _loadJsonFile.default)(BLOCK_DATA_FILE_PATH);
+
+  // Only update block data if there are files.
+  if (files && Array.isArray(files) && files.length > 0) {
+    // Upload block assets.
+    const fileIdToNewFileMap = await (0, _uploadAssets.uploadAssets)({
+      context,
+      files,
+      fileUploadsData
+    });
+    console.log("After uploadAssets:fileIdToNewFileMap", JSON.stringify(Object.fromEntries(fileIdToNewFileMap)));
+    const settings = await context.fileManager.getSettings();
+    const {
+      srcPrefix = ""
+    } = settings || {};
+    (0, _updateFilesInData.updateFilesInData)({
+      data: block.content || {},
+      fileIdToNewFileMap,
+      srcPrefix
+    });
+    block.preview = updateBlockPreviewImage({
+      /**
+       * Casting as this is only a type error.
+       */
+      file: block.preview || {},
+      fileIdToNewFileMap,
+      srcPrefix
+    });
+  }
+
+  // Check if block category already exists
+  const blockCategory = await context.pageBuilder.getBlockCategory(category === null || category === void 0 ? void 0 : category.slug);
+  if (!blockCategory) {
+    await context.pageBuilder.createBlockCategory({
+      name: category.name,
+      slug: category.slug,
+      icon: category.icon,
+      description: category.description
+    });
+  }
+  log("Removing Directory for block...");
+  await (0, _downloadInstallFiles.deleteFile)(blockKey);
+  log(`Remove block contents from S3...`);
+  await (0, _deleteS3Folder.deleteS3Folder)(_path.default.dirname(fileUploadsData.data));
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, block), {}, {
+    blockCategory: category.slug
+  });
+}
+function updateBlockPreviewImage(params) {
+  const {
+    file: blockPreview,
+    fileIdToNewFileMap,
+    srcPrefix
+  } = params;
+  const newFile = fileIdToNewFileMap.get(blockPreview.id || "");
+  console.log("updateBlockPreviewImage", blockPreview.id, newFile);
+  if (!newFile) {
+    console.log("Block preview file not found!");
+    return blockPreview;
+  }
+  const srcPrefixWithoutTrailingSlash = srcPrefix.endsWith("/") ? srcPrefix.slice(0, -1) : srcPrefix;
+  blockPreview.src = `${srcPrefixWithoutTrailingSlash}/${newFile.key}`;
+  return blockPreview;
+}

package/import/process/blocks/importBlock.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_path","_interopRequireDefault","require","_dotPropImmutable","_loadJsonFile","_fsExtra","_s3Stream","_uploadAssets","_downloadInstallFiles","_deleteS3Folder","_updateFilesInData","_constants","importBlock","blockKey","context","fileUploadsData","log","console","BLOCK_EXTRACT_DIR","path","join","INSTALL_EXTRACT_DIR","ensureDirSync","blockDataFileKey","dotProp","get","BLOCK_DATA_FILE_PATH","basename","Promise","resolve","reject","s3Stream","readStream","on","pipe","createWriteStream","block","category","files","loadJson","Array","isArray","length","fileIdToNewFileMap","uploadAssets","JSON","stringify","Object","fromEntries","settings","fileManager","getSettings","srcPrefix","updateFilesInData","data","content","preview","updateBlockPreviewImage","file","blockCategory","pageBuilder","getBlockCategory","slug","createBlockCategory","name","icon","description","deleteFile","deleteS3Folder","dirname","_objectSpread2","default","params","blockPreview","newFile","id","srcPrefixWithoutTrailingSlash","endsWith","slice","src","key"],"sources":["importBlock.ts"],"sourcesContent":["import path from \"path\";\nimport dotProp from \"dot-prop-immutable\";\nimport loadJson from \"load-json-file\";\nimport { ensureDirSync, createWriteStream } from \"fs-extra\";\nimport { FileInput } from \"@webiny/api-file-manager/types\";\nimport { PbImportExportContext } from \"~/graphql/types\";\nimport { File as ImageFile, FileUploadsData } from \"~/types\";\nimport { PageBlock } from \"@webiny/api-page-builder/types\";\nimport { ExportedBlockData } from \"~/export/utils\";\nimport { s3Stream } from \"~/export/s3Stream\";\nimport { uploadAssets } from \"~/import/utils/uploadAssets\";\nimport { deleteFile } from \"@webiny/api-page-builder/graphql/crud/install/utils/downloadInstallFiles\";\nimport { deleteS3Folder } from \"~/import/utils/deleteS3Folder\";\nimport { updateFilesInData } from \"~/import/utils/updateFilesInData\";\nimport { INSTALL_EXTRACT_DIR } from \"~/import/constants\";\n\ninterface ImportBlockParams {\n    key: string;\n    blockKey: string;\n    context: PbImportExportContext;\n    fileUploadsData: FileUploadsData;\n}\n\ninterface UpdateBlockPreviewImage {\n    fileIdToNewFileMap: Map<string, FileInput>;\n    srcPrefix: string;\n    file: ImageFile;\n}\n\nexport async function importBlock({\n    blockKey,\n    context,\n    fileUploadsData\n}: ImportBlockParams): Promise<Pick<PageBlock, \"name\" | \"content\" | \"preview\" | \"blockCategory\">> {\n    const log = console.log;\n\n    // Making Directory for block in which we're going to extract the block data file.\n    const BLOCK_EXTRACT_DIR = path.join(INSTALL_EXTRACT_DIR, blockKey);\n    ensureDirSync(BLOCK_EXTRACT_DIR);\n\n    const blockDataFileKey = dotProp.get(fileUploadsData, `data`);\n    const BLOCK_DATA_FILE_PATH = path.join(BLOCK_EXTRACT_DIR, path.basename(blockDataFileKey));\n\n    log(`Downloading Block data file: ${blockDataFileKey} at \"${BLOCK_DATA_FILE_PATH}\"`);\n    // Download and save block data file in disk.\n    await new Promise((resolve, reject) => {\n        s3Stream\n            .readStream(blockDataFileKey)\n            .on(\"error\", reject)\n            .pipe(createWriteStream(BLOCK_DATA_FILE_PATH))\n            .on(\"error\", reject)\n            .on(\"finish\", resolve);\n    });\n\n    // Load the block data file from disk.\n    log(`Load file ${blockDataFileKey}`);\n    const { block, category, files } = await loadJson<ExportedBlockData>(BLOCK_DATA_FILE_PATH);\n\n    // Only update block data if there are files.\n    if (files && Array.isArray(files) && files.length > 0) {\n        // Upload block assets.\n        const fileIdToNewFileMap = await uploadAssets({\n            context,\n            files,\n            fileUploadsData\n        });\n\n        console.log(\n            \"After uploadAssets:fileIdToNewFileMap\",\n            JSON.stringify(Object.fromEntries(fileIdToNewFileMap))\n        );\n\n        const settings = await context.fileManager.getSettings();\n\n        const { srcPrefix = \"\" } = settings || {};\n        updateFilesInData({\n            data: block.content || {},\n            fileIdToNewFileMap,\n            srcPrefix\n        });\n\n        block.preview = updateBlockPreviewImage({\n            /**\n             * Casting as this is only a type error.\n             */\n            file: (block.preview as ImageFile) || {},\n            fileIdToNewFileMap,\n            srcPrefix\n        });\n    }\n\n    // Check if block category already exists\n    const blockCategory = await context.pageBuilder.getBlockCategory(category?.slug);\n    if (!blockCategory) {\n        await context.pageBuilder.createBlockCategory({\n            name: category.name,\n            slug: category.slug,\n            icon: category.icon,\n            description: category.description\n        });\n    }\n\n    log(\"Removing Directory for block...\");\n    await deleteFile(blockKey);\n\n    log(`Remove block contents from S3...`);\n    await deleteS3Folder(path.dirname(fileUploadsData.data));\n\n    return { ...block, blockCategory: category.slug };\n}\n\nfunction updateBlockPreviewImage(params: UpdateBlockPreviewImage): ImageFile {\n    const { file: blockPreview, fileIdToNewFileMap, srcPrefix } = params;\n    const newFile = fileIdToNewFileMap.get(blockPreview.id || \"\");\n\n    console.log(\"updateBlockPreviewImage\", blockPreview.id, newFile);\n\n    if (!newFile) {\n        console.log(\"Block preview file not found!\");\n        return blockPreview;\n    }\n\n    const srcPrefixWithoutTrailingSlash = srcPrefix.endsWith(\"/\")\n        ? srcPrefix.slice(0, -1)\n        : srcPrefix;\n\n    blockPreview.src = `${srcPrefixWithoutTrailingSlash}/${newFile.key}`;\n\n    return blockPreview;\n}\n"],"mappings":"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"}

package/import/process/forms/formsHandler.d.ts

@@ -0,0 +1,3 @@
+import { PbImportExportContext } from "../../../types";
+import { Configuration, Payload, Response } from "..";
+export declare const formsHandler: (configuration: Configuration, payload: Payload, context: PbImportExportContext) => Promise<Response>;

package/import/process/forms/formsHandler.js

@@ -0,0 +1,176 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formsHandler = void 0;
+var _types = require("../../../types");
+var _importForm = require("./importForm");
+var _client = require("../../../client");
+var _mockSecurity = require("../../../mockSecurity");
+var _utils = require("@webiny/utils");
+const formsHandler = async (configuration, payload, context) => {
+  const log = console.log;
+  let subTask;
+  let noPendingTask = true;
+  let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
+  log("RUNNING Import Form Queue Process");
+  const {
+    formBuilder,
+    pageBuilder
+  } = context;
+  const {
+    taskId,
+    subTaskIndex,
+    type,
+    identity
+  } = payload;
+  // Disable authorization; this is necessary because we call Form Builder CRUD methods which include authorization checks
+  // and this Lambda is invoked internally, without credentials.
+  (0, _mockSecurity.mockSecurity)(identity, context);
+  try {
+    /*
+     * Note: We're not going to DB for getting next sub-task to process,
+     * because the data might be out of sync due to GSI eventual consistency.
+     */
+
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
+
+    /**
+     * Base condition!!
+     * Bail out early, if task not found or task's status is not "pending".
+     */
+    if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
+      noPendingTask = true;
+      return {
+        data: "",
+        error: null
+      };
+    } else {
+      noPendingTask = false;
+    }
+    prevStatusOfSubTask = subTask.status;
+    log(`Fetched sub task => ${subTask.id}`);
+    const {
+      formKey,
+      zipFileKey,
+      input
+    } = subTask.data;
+    const {
+      fileUploadsData
+    } = input;
+    log(`Processing form key "${formKey}"`);
+
+    // Mark task status as PROCESSING
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.PROCESSING
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.PROCESSING
+    });
+    prevStatusOfSubTask = subTask.status;
+
+    // Real job
+    const form = await (0, _importForm.importForm)({
+      formKey,
+      key: zipFileKey,
+      fileUploadsData
+    });
+
+    // Create a form
+    let fbForm = await formBuilder.createForm({
+      name: form.name
+    });
+
+    // Update form with data
+    fbForm = await formBuilder.updateForm(fbForm.id, {
+      name: form.name,
+      fields: form.fields,
+      layout: form.layout,
+      settings: form.settings,
+      triggers: form.triggers
+    });
+
+    // Update task record in DB
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.COMPLETED,
+      data: {
+        message: "Done",
+        form: {
+          id: fbForm.id,
+          name: fbForm.name,
+          status: fbForm.status,
+          version: fbForm.version
+        }
+      }
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.COMPLETED
+    });
+    prevStatusOfSubTask = subTask.status;
+  } catch (e) {
+    log("[IMPORT_FORMS_PROCESS] Error => ", e);
+    if (subTask && subTask.id) {
+      /**
+       * In case of error, we'll update the task status to "failed",
+       * so that, client can show notify the user appropriately.
+       */
+      subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+        status: _types.ImportExportTaskStatus.FAILED,
+        error: {
+          name: e.name,
+          message: e.message,
+          stack: e.stack,
+          code: "IMPORT_FAILED"
+        }
+      });
+
+      // Update stats in main task
+      await pageBuilder.importExportTask.updateStats(taskId, {
+        prevStatus: prevStatusOfSubTask,
+        nextStatus: _types.ImportExportTaskStatus.FAILED
+      });
+      prevStatusOfSubTask = subTask.status;
+    }
+    return {
+      data: null,
+      error: {
+        message: e.message
+      }
+    };
+  } finally {
+    // Base condition!
+    if (noPendingTask) {
+      log(`No pending sub-task for task ${taskId}`);
+      await pageBuilder.importExportTask.updateTask(taskId, {
+        status: _types.ImportExportTaskStatus.COMPLETED,
+        data: {
+          message: `Finish importing forms.`
+        }
+      });
+    } else {
+      log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
+      // We want to continue with Self invocation no matter if current form error out.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.process,
+        payload: {
+          taskId,
+          subTaskIndex: subTaskIndex + 1,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Import forms - process - subtask"
+      });
+    }
+  }
+  return {
+    data: "",
+    error: null
+  };
+};
+exports.formsHandler = formsHandler;

package/import/process/forms/formsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_importForm","_client","_mockSecurity","_utils","formsHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","formBuilder","pageBuilder","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","formKey","zipFileKey","input","fileUploadsData","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","form","importForm","key","fbForm","createForm","name","updateForm","fields","layout","settings","triggers","COMPLETED","message","version","e","FAILED","stack","code","updateTask","invokeHandlerClient","handlers","process","security","getIdentity","description","exports"],"sources":["formsHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { importForm } from \"./importForm\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/process\";\n\nexport const formsHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Import Form Queue Process\");\n    const { formBuilder, pageBuilder } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Form Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity, context);\n\n    try {\n        /*\n         * Note: We're not going to DB for getting next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { formKey, zipFileKey, input } = subTask.data;\n        const { fileUploadsData } = input;\n\n        log(`Processing form key \"${formKey}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        // Real job\n        const form = await importForm({\n            formKey,\n            key: zipFileKey,\n            fileUploadsData\n        });\n\n        // Create a form\n        let fbForm = await formBuilder.createForm({ name: form.name });\n\n        // Update form with data\n        fbForm = await formBuilder.updateForm(fbForm.id, {\n            name: form.name,\n            fields: form.fields,\n            layout: form.layout,\n            settings: form.settings,\n            triggers: form.triggers\n        });\n\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: \"Done\",\n                form: {\n                    id: fbForm.id,\n                    name: fbForm.name,\n                    status: fbForm.status,\n                    version: fbForm.version\n                }\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[IMPORT_FORMS_PROCESS] Error => \", e);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    stack: e.stack,\n                    code: \"IMPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n\n            await pageBuilder.importExportTask.updateTask(taskId, {\n                status: ImportExportTaskStatus.COMPLETED,\n                data: {\n                    message: `Finish importing forms.`\n                }\n            });\n        } else {\n            log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current form error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Import forms - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}

package/import/process/forms/importForm.d.ts

@@ -0,0 +1,9 @@
+import { FileUploadsData } from "../../../types";
+import { ExportedFormData } from "../../../export/utils";
+interface ImportFormParams {
+    key: string;
+    formKey: string;
+    fileUploadsData: FileUploadsData;
+}
+export declare function importForm({ formKey, fileUploadsData }: ImportFormParams): Promise<ExportedFormData["form"]>;
+export {};

package/import/process/forms/importForm.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.importForm = importForm;
+var _dotPropImmutable = _interopRequireDefault(require("dot-prop-immutable"));
+var _fsExtra = require("fs-extra");
+var _path = _interopRequireDefault(require("path"));
+var _loadJsonFile = _interopRequireDefault(require("load-json-file"));
+var _downloadInstallFiles = require("@webiny/api-page-builder/graphql/crud/install/utils/downloadInstallFiles");
+var _s3Stream = require("../../../export/s3Stream");
+var _deleteS3Folder = require("../../utils/deleteS3Folder");
+var _constants = require("../../constants");
+async function importForm({
+  formKey,
+  fileUploadsData
+}) {
+  const log = console.log;
+
+  // Making Directory for form in which we're going to extract the form data file.
+  const FORM_EXTRACT_DIR = _path.default.join(_constants.INSTALL_EXTRACT_DIR, formKey);
+  (0, _fsExtra.ensureDirSync)(FORM_EXTRACT_DIR);
+  const formDataFileKey = _dotPropImmutable.default.get(fileUploadsData, `data`);
+  const FORM_DATA_FILE_PATH = _path.default.join(FORM_EXTRACT_DIR, _path.default.basename(formDataFileKey));
+  log(`Downloading Form data file: ${formDataFileKey} at "${FORM_DATA_FILE_PATH}"`);
+  // Download and save form data file in disk.
+  await new Promise((resolve, reject) => {
+    _s3Stream.s3Stream.readStream(formDataFileKey).on("error", reject).pipe((0, _fsExtra.createWriteStream)(FORM_DATA_FILE_PATH)).on("error", reject).on("finish", resolve);
+  });
+
+  // Load the form data file from disk.
+  log(`Load file ${formDataFileKey}`);
+  const {
+    form
+  } = await (0, _loadJsonFile.default)(FORM_DATA_FILE_PATH);
+  log("Removing Directory for form...");
+  await (0, _downloadInstallFiles.deleteFile)(formKey);
+  log(`Remove form contents from S3...`);
+  await (0, _deleteS3Folder.deleteS3Folder)(_path.default.dirname(fileUploadsData.data));
+  return form;
+}

package/import/process/forms/importForm.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_dotPropImmutable","_interopRequireDefault","require","_fsExtra","_path","_loadJsonFile","_downloadInstallFiles","_s3Stream","_deleteS3Folder","_constants","importForm","formKey","fileUploadsData","log","console","FORM_EXTRACT_DIR","path","join","INSTALL_EXTRACT_DIR","ensureDirSync","formDataFileKey","dotProp","get","FORM_DATA_FILE_PATH","basename","Promise","resolve","reject","s3Stream","readStream","on","pipe","createWriteStream","form","loadJson","deleteFile","deleteS3Folder","dirname","data"],"sources":["importForm.ts"],"sourcesContent":["import dotProp from \"dot-prop-immutable\";\nimport { createWriteStream, ensureDirSync } from \"fs-extra\";\nimport path from \"path\";\nimport loadJson from \"load-json-file\";\nimport { deleteFile } from \"@webiny/api-page-builder/graphql/crud/install/utils/downloadInstallFiles\";\nimport { FileUploadsData } from \"~/types\";\nimport { s3Stream } from \"~/export/s3Stream\";\nimport { ExportedFormData } from \"~/export/utils\";\nimport { deleteS3Folder } from \"~/import/utils/deleteS3Folder\";\nimport { INSTALL_EXTRACT_DIR } from \"~/import/constants\";\n\ninterface ImportFormParams {\n    key: string;\n    formKey: string;\n    fileUploadsData: FileUploadsData;\n}\n\nexport async function importForm({\n    formKey,\n    fileUploadsData\n}: ImportFormParams): Promise<ExportedFormData[\"form\"]> {\n    const log = console.log;\n\n    // Making Directory for form in which we're going to extract the form data file.\n    const FORM_EXTRACT_DIR = path.join(INSTALL_EXTRACT_DIR, formKey);\n    ensureDirSync(FORM_EXTRACT_DIR);\n\n    const formDataFileKey = dotProp.get(fileUploadsData, `data`);\n    const FORM_DATA_FILE_PATH = path.join(FORM_EXTRACT_DIR, path.basename(formDataFileKey));\n\n    log(`Downloading Form data file: ${formDataFileKey} at \"${FORM_DATA_FILE_PATH}\"`);\n    // Download and save form data file in disk.\n    await new Promise((resolve, reject) => {\n        s3Stream\n            .readStream(formDataFileKey)\n            .on(\"error\", reject)\n            .pipe(createWriteStream(FORM_DATA_FILE_PATH))\n            .on(\"error\", reject)\n            .on(\"finish\", resolve);\n    });\n\n    // Load the form data file from disk.\n    log(`Load file ${formDataFileKey}`);\n    const { form } = await loadJson<ExportedFormData>(FORM_DATA_FILE_PATH);\n\n    log(\"Removing Directory for form...\");\n    await deleteFile(formKey);\n\n    log(`Remove form contents from S3...`);\n    await deleteS3Folder(path.dirname(fileUploadsData.data));\n\n    return form;\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,iBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,aAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,qBAAA,GAAAJ,OAAA;AAEA,IAAAK,SAAA,GAAAL,OAAA;AAEA,IAAAM,eAAA,GAAAN,OAAA;AACA,IAAAO,UAAA,GAAAP,OAAA;AAQO,eAAeQ,UAAUA,CAAC;EAC7BC,OAAO;EACPC;AACc,CAAC,EAAqC;EACpD,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;;EAEvB;EACA,MAAME,gBAAgB,GAAGC,aAAI,CAACC,IAAI,CAACC,8BAAmB,EAAEP,OAAO,CAAC;EAChE,IAAAQ,sBAAa,EAACJ,gBAAgB,CAAC;EAE/B,MAAMK,eAAe,GAAGC,yBAAO,CAACC,GAAG,CAACV,eAAe,EAAG,MAAK,CAAC;EAC5D,MAAMW,mBAAmB,GAAGP,aAAI,CAACC,IAAI,CAACF,gBAAgB,EAAEC,aAAI,CAACQ,QAAQ,CAACJ,eAAe,CAAC,CAAC;EAEvFP,GAAG,CAAE,+BAA8BO,eAAgB,QAAOG,mBAAoB,GAAE,CAAC;EACjF;EACA,MAAM,IAAIE,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACnCC,kBAAQ,CACHC,UAAU,CAACT,eAAe,CAAC,CAC3BU,EAAE,CAAC,OAAO,EAAEH,MAAM,CAAC,CACnBI,IAAI,CAAC,IAAAC,0BAAiB,EAACT,mBAAmB,CAAC,CAAC,CAC5CO,EAAE,CAAC,OAAO,EAAEH,MAAM,CAAC,CACnBG,EAAE,CAAC,QAAQ,EAAEJ,OAAO,CAAC;EAC9B,CAAC,CAAC;;EAEF;EACAb,GAAG,CAAE,aAAYO,eAAgB,EAAC,CAAC;EACnC,MAAM;IAAEa;EAAK,CAAC,GAAG,MAAM,IAAAC,qBAAQ,EAAmBX,mBAAmB,CAAC;EAEtEV,GAAG,CAAC,gCAAgC,CAAC;EACrC,MAAM,IAAAsB,gCAAU,EAACxB,OAAO,CAAC;EAEzBE,GAAG,CAAE,iCAAgC,CAAC;EACtC,MAAM,IAAAuB,8BAAc,EAACpB,aAAI,CAACqB,OAAO,CAACzB,eAAe,CAAC0B,IAAI,CAAC,CAAC;EAExD,OAAOL,IAAI;AACf"}

package/{importPages → import}/process/index.d.ts

@@ -1,6 +1,6 @@
-import { PbPageImportExportContext } from "../../types";
+import { PbImportExportContext } from "../../types";
 import { SecurityIdentity } from "@webiny/api-security/types";
-interface Configuration {
+export interface Configuration {
     handlers: {
         process: string;
     };
@@ -8,11 +8,13 @@ interface Configuration {
 export interface Payload {
     taskId: string;
     subTaskIndex: number;
+    type: string;
     identity: SecurityIdentity;
+    meta?: Record<string, any>;
 }
 export interface Response {
     data: string | null;
     error: Partial<Error> | null;
 }
-declare const _default: (configuration: Configuration) => import("@webiny/handler-aws").RawEventHandler<Payload, PbPageImportExportContext, Response>;
+declare const _default: (configuration: Configuration) => import("@webiny/handler-aws").RawEventHandler<Payload, PbImportExportContext, Response>;
 export default _default;