@webiny/api-page-builder-import-export 5.33.5 → 5.34.0-beta.1

package/import/process/pagesHandler.js

@@ -0,0 +1,180 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pagesHandler = void 0;
+
+var _types = require("../../types");
+
+var _utils = require("../utils");
+
+var _client = require("../../client");
+
+var _mockSecurity = require("../../mockSecurity");
+
+var _utils2 = require("@webiny/utils");
+
+const pagesHandler = async (configuration, payload, context) => {
+  const log = console.log;
+  let subTask;
+  let noPendingTask = true;
+  let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
+  log("RUNNING Import Page 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, _utils2.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 {
+      pageKey,
+      category,
+      zipFileKey,
+      input
+    } = subTask.data;
+    const {
+      fileUploadsData
+    } = input;
+    log(`Processing page key "${pageKey}"`); // 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 page = await (0, _utils.importPage)({
+      context,
+      pageKey,
+      key: zipFileKey,
+      fileUploadsData
+    }); // Create a page
+
+    let pbPage = await context.pageBuilder.createPage(category); // Update page with data
+
+    pbPage = await context.pageBuilder.updatePage(pbPage.id, {
+      content: page.content,
+      title: page.title,
+      path: page.path,
+      settings: page.settings
+    }); // TODO: Publish page
+    // Update task record in DB
+
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.COMPLETED,
+      data: {
+        message: "Done",
+        page: {
+          id: pbPage.id,
+          title: pbPage.title,
+          version: pbPage.version,
+          status: pbPage.status
+        }
+      }
+    }); // Update stats in main task
+
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.COMPLETED
+    });
+    prevStatusOfSubTask = subTask.status;
+  } catch (e) {
+    log("[IMPORT_PAGES_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 pages.`
+        }
+      });
+    } else {
+      log(`Invoking PROCESS for task "${subTaskIndex + 1}"`); // We want to continue with Self invocation no matter if current page error out.
+
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.process,
+        payload: {
+          taskId,
+          subTaskIndex: subTaskIndex + 1,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Import pages - process - subtask"
+      });
+    }
+  }
+
+  return {
+    data: "",
+    error: null
+  };
+};
+
+exports.pagesHandler = pagesHandler;

package/import/process/pagesHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["pagesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","pageKey","category","zipFileKey","input","fileUploadsData","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","page","importPage","key","pbPage","createPage","updatePage","content","title","path","settings","COMPLETED","message","version","e","FAILED","name","stack","code","updateTask","invokeHandlerClient","handlers","process","security","getIdentity","description"],"sources":["pagesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { importPage } from \"~/import/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/process\";\n\nexport const pagesHandler = 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 Page 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\n        const { pageKey, category, zipFileKey, input } = subTask.data;\n        const { fileUploadsData } = input;\n\n        log(`Processing page key \"${pageKey}\"`);\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 page = await importPage({\n            context,\n            pageKey,\n            key: zipFileKey,\n            fileUploadsData\n        });\n\n        // Create a page\n        let pbPage = await context.pageBuilder.createPage(category);\n\n        // Update page with data\n        pbPage = await context.pageBuilder.updatePage(pbPage.id, {\n            content: page.content,\n            title: page.title,\n            path: page.path,\n            settings: page.settings\n        });\n\n        // TODO: Publish page\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                page: {\n                    id: pbPage.id,\n                    title: pbPage.title,\n                    version: pbPage.version,\n                    status: pbPage.status\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_PAGES_PROCESS] Error => \", e);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    stack: e.stack,\n                    code: \"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 pages.`\n                }\n            });\n        } else {\n            log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current page 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 pages - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}

package/{importPages → import}/utils.d.ts

@@ -1,23 +1,15 @@
-import { File } from "../types";
-import { PbPageImportExportContext } from "../graphql/types";
-import { ExportedPageData } from "../exportPages/utils";
-interface FileItem extends File {
-    key: string;
-    type: string;
-    name: string;
-    size: number;
-    meta: Record<string, any>;
-    tags: string[];
-}
-interface UploadPageAssetsParams {
-    context: PbPageImportExportContext;
-    filesData: FileItem[];
+import { File } from "@webiny/api-file-manager/types";
+import { PbImportExportContext } from "../graphql/types";
+import { ExportedPageData, ExportedBlockData } from "../export/utils";
+interface UploadAssetsParams {
+    context: PbImportExportContext;
+    filesData: File[];
     fileUploadsData: FileUploadsData;
 }
-interface UploadPageAssetsReturnType {
+interface UploadAssetsReturnType {
     fileIdToKeyMap: Map<string, string>;
 }
-export declare const uploadPageAssets: (params: UploadPageAssetsParams) => Promise<UploadPageAssetsReturnType>;
+export declare const uploadAssets: (params: UploadAssetsParams) => Promise<UploadAssetsReturnType>;
 interface FileUploadsData {
     data: string;
     assets: Record<string, string>;
@@ -25,11 +17,18 @@ interface FileUploadsData {
 interface ImportPageParams {
     key: string;
     pageKey: string;
-    context: PbPageImportExportContext;
+    context: PbImportExportContext;
     fileUploadsData: FileUploadsData;
 }
 export declare function importPage({ pageKey, context, fileUploadsData }: ImportPageParams): Promise<ExportedPageData["page"]>;
-interface PageImportData {
+interface ImportBlockParams {
+    key: string;
+    blockKey: string;
+    context: PbImportExportContext;
+    fileUploadsData: FileUploadsData;
+}
+export declare function importBlock({ blockKey, context, fileUploadsData }: ImportBlockParams): Promise<ExportedBlockData["block"]>;
+interface ImportData {
     assets: Record<string, string>;
     data: string;
     key: string;
@@ -37,9 +36,9 @@ interface PageImportData {
 /**
  * Function will read the given zip file from S3 via stream, extract its content and upload it to S3 bucket.
  * @param zipFileUrl
- * @return PageImportData S3 file keys for all uploaded assets group by page.
+ * @return ImportData S3 file keys for all uploaded assets group by page/block.
  */
-export declare function readExtractAndUploadZipFileContents(zipFileUrl: string): Promise<PageImportData[]>;
+export declare function readExtractAndUploadZipFileContents(zipFileUrl: string): Promise<ImportData[]>;
 export declare function initialStats(total: number): {
     pending: number;
     processing: number;

package/{importPages → import}/utils.js

@@ -1,14 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.importBlock = importBlock;
 exports.importPage = importPage;
 exports.initialStats = initialStats;
 exports.readExtractAndUploadZipFileContents = readExtractAndUploadZipFileContents;
-exports.uploadPageAssets = void 0;
+exports.uploadAssets = void 0;
 
 var _uniqid = _interopRequireDefault(require("uniqid"));
 
@@ -38,12 +39,12 @@ var _downloadInstallFiles = require("@webiny/api-page-builder/graphql/crud/insta
 
 var _types = require("../types");
 
-var _s3Stream = require("../exportPages/s3Stream");
+var _s3Stream = require("../export/s3Stream");
 
 const streamPipeline = (0, _util.promisify)(_stream.pipeline);
 const INSTALL_DIR = "/tmp";
 
-const INSTALL_EXTRACT_DIR = _path.default.join(INSTALL_DIR, "apiPageBuilderImportPage");
+const INSTALL_EXTRACT_DIR = _path.default.join(INSTALL_DIR, "apiPageBuilderImport");
 
 const FILES_COUNT_IN_EACH_BATCH = 15;
 
@@ -71,7 +72,19 @@ function updateImageInPageSettings(params) {
   return newSettings;
 }
 
-function updateFilesInPageData({
+function updateBlockPreviewImage(params) {
+  const {
+    file,
+    fileIdToKeyMap,
+    srcPrefix
+  } = params;
+  const newFile = file;
+  const srcPrefixWithoutTrailingSlash = srcPrefix.endsWith("/") ? srcPrefix.slice(0, -1) : srcPrefix;
+  newFile.src = `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(file.id || "")}`;
+  return newFile;
+}
+
+function updateFilesInData({
   data,
   fileIdToKeyMap,
   srcPrefix
@@ -85,7 +98,7 @@ function updateFilesInPageData({
   if (Array.isArray(data)) {
     for (let i = 0; i < data.length; i++) {
       const element = data[i];
-      updateFilesInPageData({
+      updateFilesInData({
         data: element,
         fileIdToKeyMap,
         srcPrefix
@@ -106,7 +119,7 @@ function updateFilesInPageData({
       value.name = fileIdToKeyMap.get(value.id);
       value.src = `${srcPrefix}${srcPrefix.endsWith("/") ? "" : "/"}${fileIdToKeyMap.get(value.id)}`;
     } else {
-      updateFilesInPageData({
+      updateFilesInData({
         data: value,
         srcPrefix,
         fileIdToKeyMap
@@ -115,7 +128,7 @@ function updateFilesInPageData({
   }
 }
 
-const uploadPageAssets = async params => {
+const uploadAssets = async params => {
   const {
     context,
     filesData,
@@ -133,9 +146,8 @@ const uploadPageAssets = async params => {
     return {
       fileIdToKeyMap
     };
-  }
+  } // Save files meta data against old key for later use.
 
-  console.log("INSIDE uploadPageAssets"); // Save files meta data against old key for later use.
 
   const fileKeyToFileMap = new Map(); // Initialize maps.
 
@@ -190,7 +202,7 @@ const uploadPageAssets = async params => {
   };
 };
 
-exports.uploadPageAssets = uploadPageAssets;
+exports.uploadAssets = uploadAssets;
 
 async function importPage({
   pageKey,
@@ -223,7 +235,7 @@ async function importPage({
     // Upload page assets.
     const {
       fileIdToKeyMap
-    } = await uploadPageAssets({
+    } = await uploadAssets({
       context,
 
       /**
@@ -237,7 +249,7 @@ async function importPage({
     const {
       srcPrefix = ""
     } = settings || {};
-    updateFilesInPageData({
+    updateFilesInData({
       data: page.content || {},
       fileIdToKeyMap,
       srcPrefix
@@ -256,6 +268,65 @@ async function importPage({
   return page;
 }
 
+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(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, _fs.createWriteStream)(BLOCK_DATA_FILE_PATH)).on("error", reject).on("finish", resolve);
+  }); // Load the block data file from disk.
+
+  log(`Load file ${blockDataFileKey}`);
+  const {
+    block,
+    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 {
+      fileIdToKeyMap
+    } = await uploadAssets({
+      context,
+      filesData: files,
+      fileUploadsData
+    });
+    const settings = await context.fileManager.settings.getSettings();
+    const {
+      srcPrefix = ""
+    } = settings || {};
+    updateFilesInData({
+      data: block.content || {},
+      fileIdToKeyMap,
+      srcPrefix
+    });
+    block.preview = updateBlockPreviewImage({
+      file: block.preview || {},
+      fileIdToKeyMap,
+      srcPrefix
+    });
+  }
+
+  log("Removing Directory for block...");
+  await (0, _downloadInstallFiles.deleteFile)(blockKey);
+  log(`Remove block contents from S3...`);
+  await deleteS3Folder(_path.default.dirname(fileUploadsData.data));
+  return block;
+}
+
 async function uploadFilesFromS3({
   fileKeyToFileMap,
   oldKeyToNewKeyMap
@@ -310,11 +381,11 @@ function getFileNameWithoutExt(fileName) {
 /**
  * Function will read the given zip file from S3 via stream, extract its content and upload it to S3 bucket.
  * @param zipFileUrl
- * @return PageImportData S3 file keys for all uploaded assets group by page.
+ * @return ImportData S3 file keys for all uploaded assets group by page/block.
  */
 async function readExtractAndUploadZipFileContents(zipFileUrl) {
   const log = console.log;
-  const pageImportDataList = [];
+  const importDataList = [];
 
   const zipFileName = _path.default.basename(zipFileUrl).split("?")[0];
 
@@ -325,7 +396,7 @@ async function readExtractAndUploadZipFileContents(zipFileUrl) {
   }
 
   const readStream = response.body;
-  const uniquePath = (0, _uniqid.default)("IMPORT_PAGES/"); // Read export file and download it in the disk
+  const uniquePath = (0, _uniqid.default)("IMPORTS/"); // Read export file and download it in the disk
 
   const ZIP_FILE_PATH = _path.default.join(INSTALL_DIR, zipFileName);
 
@@ -335,22 +406,22 @@ async function readExtractAndUploadZipFileContents(zipFileUrl) {
 
   const zipFilePaths = await extractZipToDisk(ZIP_FILE_PATH);
   log(`Removing ZIP file "${zipFileUrl}" from ${ZIP_FILE_PATH}`);
-  await (0, _downloadInstallFiles.deleteFile)(ZIP_FILE_PATH); // Extract each page zip and upload their content's to S3
+  await (0, _downloadInstallFiles.deleteFile)(ZIP_FILE_PATH); // Extract each page/block zip and upload their content's to S3
 
   for (let i = 0; i < zipFilePaths.length; i++) {
     const currentPath = zipFilePaths[i];
     const dataMap = await extractZipAndUploadToS3(currentPath, uniquePath);
-    pageImportDataList.push(dataMap);
+    importDataList.push(dataMap);
   }
 
   log("Removing all ZIP files located at ", _path.default.dirname(zipFilePaths[0]));
   await (0, _downloadInstallFiles.deleteFile)(_path.default.dirname(zipFilePaths[0]));
-  return pageImportDataList;
+  return importDataList;
 }
 
 const ASSETS_DIR_NAME = "/assets";
 
-function preparePageDataDirMap({
+function prepareDataDirMap({
   map,
   filePath,
   newKey
@@ -394,17 +465,17 @@ async function deleteS3Folder(key) {
 
 function initialStats(total) {
   return {
-    [_types.PageImportExportTaskStatus.PENDING]: total,
-    [_types.PageImportExportTaskStatus.PROCESSING]: 0,
-    [_types.PageImportExportTaskStatus.COMPLETED]: 0,
-    [_types.PageImportExportTaskStatus.FAILED]: 0,
+    [_types.ImportExportTaskStatus.PENDING]: total,
+    [_types.ImportExportTaskStatus.PROCESSING]: 0,
+    [_types.ImportExportTaskStatus.COMPLETED]: 0,
+    [_types.ImportExportTaskStatus.FAILED]: 0,
     total
   };
 }
 
 function extractZipToDisk(exportFileZipPath) {
   return new Promise((resolve, reject) => {
-    const pageZipFilePaths = [];
+    const zipFilePaths = [];
     const uniqueFolderNameForExport = getFileNameWithoutExt(exportFileZipPath);
 
     const EXPORT_FILE_EXTRACTION_PATH = _path.default.join(INSTALL_DIR, uniqueFolderNameForExport); // Make sure DIR exists
@@ -434,7 +505,7 @@ function extractZipToDisk(exportFileZipPath) {
           reject(err);
         }
 
-        resolve(pageZipFilePaths);
+        resolve(zipFilePaths);
       });
       zipFile.readEntry();
       zipFile.on("entry", function (entry) {
@@ -463,7 +534,7 @@ function extractZipToDisk(exportFileZipPath) {
             const filePath = _path.default.join(EXPORT_FILE_EXTRACTION_PATH, entry.fileName);
 
             readStream.on("end", function () {
-              pageZipFilePaths.push(filePath);
+              zipFilePaths.push(filePath);
               zipFile.readEntry();
             });
             streamPipeline(readStream, (0, _fs.createWriteStream)(filePath)).catch(error => {
@@ -476,28 +547,28 @@ function extractZipToDisk(exportFileZipPath) {
   });
 }
 
-function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
+function extractZipAndUploadToS3(dataZipFilePath, uniquePath) {
   return new Promise((resolve, reject) => {
     const filePaths = [];
     const fileUploadPromises = [];
-    const uniquePageKey = getFileNameWithoutExt(pageDataZipFilePath);
+    const uniqueKey = getFileNameWithoutExt(dataZipFilePath);
     let dataMap = {
-      key: uniquePageKey,
+      key: uniqueKey,
       assets: {},
       data: ""
     };
 
-    _yauzl.default.open(pageDataZipFilePath, {
+    _yauzl.default.open(dataZipFilePath, {
       lazyEntries: true
     }, function (err, zipFile) {
       if (err) {
-        console.warn("ERROR: Failed to extract zip: ", pageDataZipFilePath, err);
+        console.warn("ERROR: Failed to extract zip: ", dataZipFilePath, err);
         reject(err);
         return;
       }
 
       if (!zipFile) {
-        console.log("ERROR: Probably failed to extract zip: " + pageDataZipFilePath);
+        console.log("ERROR: Probably failed to extract zip: " + dataZipFilePath);
         reject("Missing Zip File Resource.");
         return;
       }
@@ -505,7 +576,7 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
       console.info(`The ZIP file contains ${zipFile.entryCount} entries.`);
       zipFile.on("end", function (err) {
         if (err) {
-          console.warn('ERROR: Failed on "END" for file: ', pageDataZipFilePath, err);
+          console.warn('ERROR: Failed on "END" for file: ', dataZipFilePath, err);
           reject(err);
         }
 
@@ -535,7 +606,7 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
             }
 
             if (!readStream) {
-              console.log("ERROR: Missing Read Stream while importing pages.");
+              console.log("ERROR: Missing Read Stream while importing.");
               reject("Missing Read Strea Resource.");
               return;
             }
@@ -544,9 +615,9 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
               filePaths.push(entry.fileName);
               zipFile.readEntry();
             });
-            const newKey = `${uniquePath}/${uniquePageKey}/${entry.fileName}`; // Modify in place
+            const newKey = `${uniquePath}/${uniqueKey}/${entry.fileName}`; // Modify in place
 
-            dataMap = preparePageDataDirMap({
+            dataMap = prepareDataDirMap({
               map: dataMap,
               filePath: entry.fileName,
               newKey