@webiny/api-page-builder-import-export 5.23.1-beta.0 → 5.24.0

package/exportPages/process/index.js

@@ -7,16 +7,16 @@ exports.default = void 0;
 
 var _types = require("../../types");
 
-var _utils = require("../../importPages/utils");
-
 var _client = require("../../importPages/client");
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
-var _utils2 = require("../utils");
+var _utils = require("../utils");
 
 var _mockSecurity = require("../../mockSecurity");
 
+var _utils2 = require("@webiny/utils");
+
 /**
  * Handles the export pages process workflow.
  */
@@ -48,7 +48,7 @@ var _default = configuration => ({
        * Note: We're not going to DB for finding the next sub-task to process,
        * because the data might be out of sync due to GSI eventual consistency.
        */
-      subTask = await pageBuilder.pageImportExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex));
+      subTask = await pageBuilder.pageImportExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
       /**
        * Base condition!!
        * Bail out early, if task not found or task's status is not "pending".
@@ -119,7 +119,7 @@ var _default = configuration => ({
       prevStatusOfSubTask = subTask.status;
       log(`Extracting page data and uploading to storage...`); // Extract Page
 
-      const pageDataZip = await (0, _utils2.exportPage)(page, exportPagesDataKey, fileManager);
+      const pageDataZip = await (0, _utils.exportPage)(page, exportPagesDataKey, fileManager);
       log(`Finish uploading zip...`); // Update task record in DB
 
       subTask = await pageBuilder.pageImportExportTask.updateSubTask(taskId, subTask.id, {

package/exportPages/utils.d.ts

@@ -7,7 +7,7 @@ export interface ExportedPageData {
     files: ImageFile[];
 }
 export declare function exportPage(page: Page, exportPagesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
-export interface ImageFile extends File {
+export interface ImageFile extends Omit<File, "src"> {
     key: string;
 }
 export declare function extractFilesFromPageData(data: Record<string, any>, files?: any[]): ImageFile[];

package/graphql/crud/pages.crud.js

@@ -23,6 +23,8 @@ var _utils = require("../../importPages/utils");
 
 var _utils2 = require("../../exportPages/utils");
 
+var _utils3 = require("@webiny/utils");
+
 const PERMISSION_NAME = "pb.page";
 const EXPORT_PAGES_PROCESS_HANDLER = process.env.EXPORT_PAGES_PROCESS_HANDLER;
 const IMPORT_PAGES_CREATE_HANDLER = process.env.IMPORT_PAGES_CREATE_HANDLER;
@@ -86,7 +88,8 @@ var _default = new _handler.ContextPlugin(context => {
         let pages = [];
         let meta = {
           hasMoreItems: true,
-          cursor: null
+          cursor: null,
+          totalCount: 0
         }; // Paginate pages
 
         while (meta.hasMoreItems) {
@@ -114,7 +117,7 @@ var _default = new _handler.ContextPlugin(context => {
       for (let i = 0; i < pageIds.length; i++) {
         const pageId = pageIds[i]; // Create sub task.
 
-        await context.pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils.zeroPad)(i + 1), {
+        await context.pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils3.zeroPad)(i + 1, 5), {
           status: _types.PageImportExportTaskStatus.PENDING,
           input: {
             pageId,

package/graphql/graphql/utils/resolve.d.ts

@@ -1,3 +1,3 @@
 import { Response, ErrorResponse } from "@webiny/handler-graphql";
-declare const _default: (fn: any) => Promise<Response<any> | ErrorResponse>;
+declare const _default: (fn: () => Promise<any>) => Promise<ErrorResponse | Response<any>>;
 export default _default;

package/importPages/create/index.js

@@ -13,6 +13,8 @@ var _client = require("../client");
 
 var _mockSecurity = require("../../mockSecurity");
 
+var _utils2 = require("@webiny/utils");
+
 /**
  * Handles the import page workflow.
  */
@@ -43,7 +45,7 @@ var _default = configuration => ({
       for (let i = 0; i < pageImportDataList.length; i++) {
         const pagesDirMap = pageImportDataList[i]; // Create sub task
 
-        const subtask = await pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils.zeroPad)(i + 1), {
+        const subtask = await pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils2.zeroPad)(i + 1, 5), {
           status: _types.PageImportExportTaskStatus.PENDING,
           data: {
             pageKey: pagesDirMap.key,

package/importPages/process/index.js

@@ -13,6 +13,8 @@ var _client = require("../client");
 
 var _mockSecurity = require("../../mockSecurity");
 
+var _utils2 = require("@webiny/utils");
+
 /**
  * Handles the import page workflow.
  */
@@ -43,7 +45,7 @@ var _default = configuration => ({
        * 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.pageImportExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex));
+      subTask = await pageBuilder.pageImportExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
       /**
        * Base condition!!
        * Bail out early, if task not found or task's status is not "pending".

package/importPages/utils.d.ts

@@ -32,12 +32,11 @@ interface PageImportData {
  * @return PageImportData S3 file keys for all uploaded assets group by page.
  */
 export declare function readExtractAndUploadZipFileContents(zipFileKey: string): Promise<PageImportData[]>;
-export declare const zeroPad: (version: any) => string;
-export declare function initialStats(total: any): {
-    pending: any;
+export declare function initialStats(total: number): {
+    pending: number;
     processing: number;
     completed: number;
     failed: number;
-    total: any;
+    total: number;
 };
 export {};

package/importPages/utils.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.importPage = importPage;
 exports.initialStats = initialStats;
 exports.readExtractAndUploadZipFileContents = readExtractAndUploadZipFileContents;
-exports.zeroPad = exports.uploadPageAssets = void 0;
+exports.uploadPageAssets = void 0;
 
 var _uniqid = _interopRequireDefault(require("uniqid"));
 
@@ -64,7 +64,7 @@ function updateImageInPageSettings({
     newSettings = _dotPropImmutable.default.set(newSettings, "social.image.src", `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(settings.social.image.id)}`);
   }
 
-  return settings;
+  return newSettings;
 }
 
 function updateFilesInPageData({
@@ -387,11 +387,8 @@ async function deleteS3Folder(key) {
   const deleteFilePromises = keys.map(key => _s3Stream.s3Stream.deleteObject(key));
   await Promise.all(deleteFilePromises);
   console.log(`Successfully deleted ${deleteFilePromises.length} files.`);
-}
-
-const zeroPad = version => `${version}`.padStart(5, "0");
+} // export const zeroPad = version => `${version}`.padStart(5, "0");
 
-exports.zeroPad = zeroPad;
 
 function initialStats(total) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-page-builder-import-export",
-	"version": "5.23.1-beta.0",
+	"version": "5.24.0",
 	"main": "index.js",
 	"keywords": [
 		"pbie:base"
@@ -16,15 +16,16 @@
 	"dependencies": {
 		"@babel/runtime": "7.16.7",
 		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api-file-manager": "5.23.1-beta.0",
-		"@webiny/api-page-builder": "5.23.1-beta.0",
-		"@webiny/api-security": "5.23.1-beta.0",
-		"@webiny/error": "5.23.1-beta.0",
-		"@webiny/handler": "5.23.1-beta.0",
-		"@webiny/handler-args": "5.23.1-beta.0",
-		"@webiny/handler-aws": "5.23.1-beta.0",
-		"@webiny/handler-graphql": "5.23.1-beta.0",
-		"@webiny/validation": "5.23.1-beta.0",
+		"@webiny/api-file-manager": "5.24.0",
+		"@webiny/api-page-builder": "5.24.0",
+		"@webiny/api-security": "5.24.0",
+		"@webiny/error": "5.24.0",
+		"@webiny/handler": "5.24.0",
+		"@webiny/handler-args": "5.24.0",
+		"@webiny/handler-aws": "5.24.0",
+		"@webiny/handler-graphql": "5.24.0",
+		"@webiny/utils": "5.24.0",
+		"@webiny/validation": "5.24.0",
 		"archiver": "5.3.0",
 		"commodo-fields-object": "1.0.6",
 		"dot-prop-immutable": "2.1.1",
@@ -45,16 +46,18 @@
 		"@babel/preset-typescript": "^7.16.0",
 		"@elastic/elasticsearch": "7.12.0",
 		"@shelf/jest-elasticsearch": "^1.0.0",
+		"@types/archiver": "^5.3.1",
 		"@types/puppeteer": "^5.4.2",
-		"@webiny/api-dynamodb-to-elasticsearch": "^5.23.1-beta.0",
-		"@webiny/api-file-manager-ddb-es": "^5.23.1-beta.0",
-		"@webiny/api-i18n-ddb": "^5.23.1-beta.0",
-		"@webiny/api-security-so-ddb": "^5.23.1-beta.0",
-		"@webiny/api-tenancy": "^5.23.1-beta.0",
-		"@webiny/api-tenancy-so-ddb": "^5.23.1-beta.0",
-		"@webiny/cli": "^5.23.1-beta.0",
-		"@webiny/db": "^5.23.1-beta.0",
-		"@webiny/project-utils": "^5.23.1-beta.0",
+		"@types/yauzl": "^2.9.2",
+		"@webiny/api-dynamodb-to-elasticsearch": "^5.24.0",
+		"@webiny/api-file-manager-ddb-es": "^5.24.0",
+		"@webiny/api-i18n-ddb": "^5.24.0",
+		"@webiny/api-security-so-ddb": "^5.24.0",
+		"@webiny/api-tenancy": "^5.24.0",
+		"@webiny/api-tenancy-so-ddb": "^5.24.0",
+		"@webiny/cli": "^5.24.0",
+		"@webiny/db": "^5.24.0",
+		"@webiny/project-utils": "^5.24.0",
 		"jest": "^26.6.3",
 		"jest-dynalite": "^3.2.0",
 		"rimraf": "^3.0.2",
@@ -76,5 +79,5 @@
 			]
 		}
 	},
-	"gitHead": "05db67aebc2de3c33ba0622f730157ae14143b95"
+	"gitHead": "be0cbfcaa9247c658c44179af7943cc5d6d71bc7"
 }