@webiny/api-page-builder-import-export 0.0.0-unstable.496cf268ac → 0.0.0-unstable.606fc9c866
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/graphql/graphql/utils/resolve.d.ts +1 -1
- package/import/process/blocks/importBlock.js +3 -0
- package/import/process/blocks/importBlock.js.map +1 -1
- package/package.json +23 -23
- package/import/process/blocksHandler.d.ts +0 -3
- package/import/process/blocksHandler.js +0 -175
- package/import/process/blocksHandler.js.map +0 -1
- package/import/process/pagesHandler.d.ts +0 -3
- package/import/process/pagesHandler.js +0 -180
- package/import/process/pagesHandler.js.map +0 -1
- package/import/utils.d.ts +0 -49
- package/import/utils.js +0 -641
- package/import/utils.js.map +0 -1
@@ -1,3 +1,3 @@
|
|
1
1
|
import { Response, ErrorResponse } from "@webiny/handler-graphql";
|
2
|
-
declare const _default: (fn: () => Promise<any>) => Promise<Response<any
|
2
|
+
declare const _default: (fn: () => Promise<any>) => Promise<ErrorResponse | Response<any>>;
|
3
3
|
export default _default;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["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","files","loadJson","Array","isArray","length","fileIdToNewFileMap","uploadAssets","JSON","stringify","Object","fromEntries","settings","fileManager","getSettings","srcPrefix","updateFilesInData","data","content","preview","updateBlockPreviewImage","file","deleteFile","deleteS3Folder","dirname","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 { 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<ExportedBlockData[\"block\"]> {\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, 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 file: block.preview || {},\n fileIdToNewFileMap,\n srcPrefix\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 console.log(\"block\", JSON.stringify(block, null, 2));\n\n return block;\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":";;;;;;;AAAA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAeO,eAAeA,WAAW,CAAC;EAC9BC,QAAQ;EACRC,OAAO;EACPC;AACe,CAAC,EAAuC;EACvD,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;;EAEvB;EACA,MAAME,iBAAiB,GAAGC,aAAI,CAACC,IAAI,CAACC,8BAAmB,EAAER,QAAQ,CAAC;EAClE,IAAAS,sBAAa,EAACJ,iBAAiB,CAAC;EAEhC,MAAMK,gBAAgB,GAAGC,yBAAO,CAACC,GAAG,CAACV,eAAe,EAAG,MAAK,CAAC;EAC7D,MAAMW,oBAAoB,GAAGP,aAAI,CAACC,IAAI,CAACF,iBAAiB,EAAEC,aAAI,CAACQ,QAAQ,CAACJ,gBAAgB,CAAC,CAAC;EAE1FP,GAAG,CAAE,gCAA+BO,gBAAiB,QAAOG,oBAAqB,GAAE,CAAC;EACpF;EACA,MAAM,IAAIE,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACnCC,kBAAQ,CACHC,UAAU,CAACT,gBAAgB,CAAC,CAC5BU,EAAE,CAAC,OAAO,EAAEH,MAAM,CAAC,CACnBI,IAAI,CAAC,IAAAC,0BAAiB,EAACT,oBAAoB,CAAC,CAAC,CAC7CO,EAAE,CAAC,OAAO,EAAEH,MAAM,CAAC,CACnBG,EAAE,CAAC,QAAQ,EAAEJ,OAAO,CAAC;EAC9B,CAAC,CAAC;;EAEF;EACAb,GAAG,CAAE,aAAYO,gBAAiB,EAAC,CAAC;EACpC,MAAM;IAAEa,KAAK;IAAEC;EAAM,CAAC,GAAG,MAAM,IAAAC,qBAAQ,EAAoBZ,oBAAoB,CAAC;;EAEhF;EACA,IAAIW,KAAK,IAAIE,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,IAAIA,KAAK,CAACI,MAAM,GAAG,CAAC,EAAE;IACnD;IACA,MAAMC,kBAAkB,GAAG,MAAM,IAAAC,0BAAY,EAAC;MAC1C7B,OAAO;MACPuB,KAAK;MACLtB;IACJ,CAAC,CAAC;IAEFE,OAAO,CAACD,GAAG,CACP,uCAAuC,EACvC4B,IAAI,CAACC,SAAS,CAACC,MAAM,CAACC,WAAW,CAACL,kBAAkB,CAAC,CAAC,CACzD;IAED,MAAMM,QAAQ,GAAG,MAAMlC,OAAO,CAACmC,WAAW,CAACC,WAAW,EAAE;IAExD,MAAM;MAAEC,SAAS,GAAG;IAAG,CAAC,GAAGH,QAAQ,IAAI,CAAC,CAAC;IACzC,IAAAI,oCAAiB,EAAC;MACdC,IAAI,EAAEjB,KAAK,CAACkB,OAAO,IAAI,CAAC,CAAC;MACzBZ,kBAAkB;MAClBS;IACJ,CAAC,CAAC;IAEFf,KAAK,CAACmB,OAAO,GAAGC,uBAAuB,CAAC;
|
1
|
+
{"version":3,"names":["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","files","loadJson","Array","isArray","length","fileIdToNewFileMap","uploadAssets","JSON","stringify","Object","fromEntries","settings","fileManager","getSettings","srcPrefix","updateFilesInData","data","content","preview","updateBlockPreviewImage","file","deleteFile","deleteS3Folder","dirname","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 { 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<ExportedBlockData[\"block\"]> {\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, 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 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 console.log(\"block\", JSON.stringify(block, null, 2));\n\n return block;\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/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@webiny/api-page-builder-import-export",
|
3
|
-
"version": "0.0.0-unstable.
|
3
|
+
"version": "0.0.0-unstable.606fc9c866",
|
4
4
|
"main": "index.js",
|
5
5
|
"keywords": [
|
6
6
|
"pbie:base"
|
@@ -16,17 +16,17 @@
|
|
16
16
|
"dependencies": {
|
17
17
|
"@babel/runtime": "7.20.13",
|
18
18
|
"@commodo/fields": "1.1.2-beta.20",
|
19
|
-
"@webiny/api": "0.0.0-unstable.
|
20
|
-
"@webiny/api-file-manager": "0.0.0-unstable.
|
21
|
-
"@webiny/api-form-builder": "0.0.0-unstable.
|
22
|
-
"@webiny/api-page-builder": "0.0.0-unstable.
|
23
|
-
"@webiny/api-security": "0.0.0-unstable.
|
24
|
-
"@webiny/error": "0.0.0-unstable.
|
25
|
-
"@webiny/handler": "0.0.0-unstable.
|
26
|
-
"@webiny/handler-aws": "0.0.0-unstable.
|
27
|
-
"@webiny/handler-graphql": "0.0.0-unstable.
|
28
|
-
"@webiny/utils": "0.0.0-unstable.
|
29
|
-
"@webiny/validation": "0.0.0-unstable.
|
19
|
+
"@webiny/api": "0.0.0-unstable.606fc9c866",
|
20
|
+
"@webiny/api-file-manager": "0.0.0-unstable.606fc9c866",
|
21
|
+
"@webiny/api-form-builder": "0.0.0-unstable.606fc9c866",
|
22
|
+
"@webiny/api-page-builder": "0.0.0-unstable.606fc9c866",
|
23
|
+
"@webiny/api-security": "0.0.0-unstable.606fc9c866",
|
24
|
+
"@webiny/error": "0.0.0-unstable.606fc9c866",
|
25
|
+
"@webiny/handler": "0.0.0-unstable.606fc9c866",
|
26
|
+
"@webiny/handler-aws": "0.0.0-unstable.606fc9c866",
|
27
|
+
"@webiny/handler-graphql": "0.0.0-unstable.606fc9c866",
|
28
|
+
"@webiny/utils": "0.0.0-unstable.606fc9c866",
|
29
|
+
"@webiny/validation": "0.0.0-unstable.606fc9c866",
|
30
30
|
"archiver": "5.3.1",
|
31
31
|
"commodo-fields-object": "1.0.6",
|
32
32
|
"dot-prop-immutable": "2.1.1",
|
@@ -48,16 +48,16 @@
|
|
48
48
|
"@types/archiver": "^5.3.1",
|
49
49
|
"@types/node-fetch": "^2.6.1",
|
50
50
|
"@types/yauzl": "^2.9.2",
|
51
|
-
"@webiny/api-dynamodb-to-elasticsearch": "^0.0.0-unstable.
|
52
|
-
"@webiny/api-file-manager-ddb-es": "^0.0.0-unstable.
|
53
|
-
"@webiny/api-i18n-ddb": "^0.0.0-unstable.
|
54
|
-
"@webiny/api-security-so-ddb": "^0.0.0-unstable.
|
55
|
-
"@webiny/api-tenancy": "^0.0.0-unstable.
|
56
|
-
"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.
|
57
|
-
"@webiny/api-wcp": "^0.0.0-unstable.
|
58
|
-
"@webiny/cli": "^0.0.0-unstable.
|
59
|
-
"@webiny/db": "^0.0.0-unstable.
|
60
|
-
"@webiny/project-utils": "^0.0.0-unstable.
|
51
|
+
"@webiny/api-dynamodb-to-elasticsearch": "^0.0.0-unstable.606fc9c866",
|
52
|
+
"@webiny/api-file-manager-ddb-es": "^0.0.0-unstable.606fc9c866",
|
53
|
+
"@webiny/api-i18n-ddb": "^0.0.0-unstable.606fc9c866",
|
54
|
+
"@webiny/api-security-so-ddb": "^0.0.0-unstable.606fc9c866",
|
55
|
+
"@webiny/api-tenancy": "^0.0.0-unstable.606fc9c866",
|
56
|
+
"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.606fc9c866",
|
57
|
+
"@webiny/api-wcp": "^0.0.0-unstable.606fc9c866",
|
58
|
+
"@webiny/cli": "^0.0.0-unstable.606fc9c866",
|
59
|
+
"@webiny/db": "^0.0.0-unstable.606fc9c866",
|
60
|
+
"@webiny/project-utils": "^0.0.0-unstable.606fc9c866",
|
61
61
|
"jest": "^28.1.0",
|
62
62
|
"jest-dynalite": "^3.2.0",
|
63
63
|
"rimraf": "^3.0.2",
|
@@ -79,5 +79,5 @@
|
|
79
79
|
]
|
80
80
|
}
|
81
81
|
},
|
82
|
-
"gitHead": "
|
82
|
+
"gitHead": "606fc9c866aec436f24983abc9bdaf02af2b8746"
|
83
83
|
}
|
@@ -1,175 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
4
|
-
value: true
|
5
|
-
});
|
6
|
-
exports.blocksHandler = void 0;
|
7
|
-
|
8
|
-
var _types = require("../../types");
|
9
|
-
|
10
|
-
var _utils = require("../utils");
|
11
|
-
|
12
|
-
var _client = require("../../client");
|
13
|
-
|
14
|
-
var _mockSecurity = require("../../mockSecurity");
|
15
|
-
|
16
|
-
var _utils2 = require("@webiny/utils");
|
17
|
-
|
18
|
-
const blocksHandler = async (configuration, payload, context) => {
|
19
|
-
const log = console.log;
|
20
|
-
let subTask;
|
21
|
-
let noPendingTask = true;
|
22
|
-
let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
|
23
|
-
log("RUNNING Import Block Queue Process");
|
24
|
-
const {
|
25
|
-
pageBuilder
|
26
|
-
} = context;
|
27
|
-
const {
|
28
|
-
taskId,
|
29
|
-
subTaskIndex,
|
30
|
-
type,
|
31
|
-
identity
|
32
|
-
} = payload; // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
|
33
|
-
// and this Lambda is invoked internally, without credentials.
|
34
|
-
|
35
|
-
(0, _mockSecurity.mockSecurity)(identity, context);
|
36
|
-
|
37
|
-
try {
|
38
|
-
/*
|
39
|
-
* Note: We're not going to DB for getting next sub-task to process,
|
40
|
-
* because the data might be out of sync due to GSI eventual consistency.
|
41
|
-
*/
|
42
|
-
subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
|
43
|
-
/**
|
44
|
-
* Base condition!!
|
45
|
-
* Bail out early, if task not found or task's status is not "pending".
|
46
|
-
*/
|
47
|
-
|
48
|
-
if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
|
49
|
-
noPendingTask = true;
|
50
|
-
return {
|
51
|
-
data: "",
|
52
|
-
error: null
|
53
|
-
};
|
54
|
-
} else {
|
55
|
-
noPendingTask = false;
|
56
|
-
}
|
57
|
-
|
58
|
-
prevStatusOfSubTask = subTask.status;
|
59
|
-
log(`Fetched sub task => ${subTask.id}`);
|
60
|
-
console.log("subTask", subTask);
|
61
|
-
const {
|
62
|
-
blockKey,
|
63
|
-
category,
|
64
|
-
zipFileKey,
|
65
|
-
input
|
66
|
-
} = subTask.data;
|
67
|
-
const {
|
68
|
-
fileUploadsData
|
69
|
-
} = input;
|
70
|
-
log(`Processing block key "${blockKey}"`); // Mark task status as PROCESSING
|
71
|
-
|
72
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
73
|
-
status: _types.ImportExportTaskStatus.PROCESSING
|
74
|
-
}); // Update stats in main task
|
75
|
-
|
76
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
77
|
-
prevStatus: prevStatusOfSubTask,
|
78
|
-
nextStatus: _types.ImportExportTaskStatus.PROCESSING
|
79
|
-
});
|
80
|
-
prevStatusOfSubTask = subTask.status; // Real job
|
81
|
-
|
82
|
-
const block = await (0, _utils.importBlock)({
|
83
|
-
context,
|
84
|
-
blockKey,
|
85
|
-
key: zipFileKey,
|
86
|
-
fileUploadsData
|
87
|
-
}); // Create a block
|
88
|
-
|
89
|
-
const pbBlock = await context.pageBuilder.createPageBlock({
|
90
|
-
name: block.name,
|
91
|
-
blockCategory: category,
|
92
|
-
content: block.content,
|
93
|
-
preview: block.preview
|
94
|
-
}); // Update task record in DB
|
95
|
-
|
96
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
97
|
-
status: _types.ImportExportTaskStatus.COMPLETED,
|
98
|
-
data: {
|
99
|
-
message: "Done",
|
100
|
-
block: {
|
101
|
-
id: pbBlock.id,
|
102
|
-
name: pbBlock.name
|
103
|
-
}
|
104
|
-
}
|
105
|
-
}); // Update stats in main task
|
106
|
-
|
107
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
108
|
-
prevStatus: prevStatusOfSubTask,
|
109
|
-
nextStatus: _types.ImportExportTaskStatus.COMPLETED
|
110
|
-
});
|
111
|
-
prevStatusOfSubTask = subTask.status;
|
112
|
-
} catch (e) {
|
113
|
-
log("[IMPORT_BLOCKS_PROCESS] Error => ", e.message);
|
114
|
-
|
115
|
-
if (subTask && subTask.id) {
|
116
|
-
/**
|
117
|
-
* In case of error, we'll update the task status to "failed",
|
118
|
-
* so that, client can show notify the user appropriately.
|
119
|
-
*/
|
120
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
121
|
-
status: _types.ImportExportTaskStatus.FAILED,
|
122
|
-
error: {
|
123
|
-
name: e.name,
|
124
|
-
message: e.message,
|
125
|
-
code: "IMPORT_FAILED"
|
126
|
-
}
|
127
|
-
}); // Update stats in main task
|
128
|
-
|
129
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
130
|
-
prevStatus: prevStatusOfSubTask,
|
131
|
-
nextStatus: _types.ImportExportTaskStatus.FAILED
|
132
|
-
});
|
133
|
-
prevStatusOfSubTask = subTask.status;
|
134
|
-
}
|
135
|
-
|
136
|
-
return {
|
137
|
-
data: null,
|
138
|
-
error: {
|
139
|
-
message: e.message
|
140
|
-
}
|
141
|
-
};
|
142
|
-
} finally {
|
143
|
-
// Base condition!
|
144
|
-
if (noPendingTask) {
|
145
|
-
log(`No pending sub-task for task ${taskId}`);
|
146
|
-
await pageBuilder.importExportTask.updateTask(taskId, {
|
147
|
-
status: _types.ImportExportTaskStatus.COMPLETED,
|
148
|
-
data: {
|
149
|
-
message: `Finish importing blocks.`
|
150
|
-
}
|
151
|
-
});
|
152
|
-
} else {
|
153
|
-
log(`Invoking PROCESS for task "${subTaskIndex + 1}"`); // We want to continue with Self invocation no matter if current block error out.
|
154
|
-
|
155
|
-
await (0, _client.invokeHandlerClient)({
|
156
|
-
context,
|
157
|
-
name: configuration.handlers.process,
|
158
|
-
payload: {
|
159
|
-
taskId,
|
160
|
-
subTaskIndex: subTaskIndex + 1,
|
161
|
-
type,
|
162
|
-
identity: context.security.getIdentity()
|
163
|
-
},
|
164
|
-
description: "Import blocks - process - subtask"
|
165
|
-
});
|
166
|
-
}
|
167
|
-
}
|
168
|
-
|
169
|
-
return {
|
170
|
-
data: "",
|
171
|
-
error: null
|
172
|
-
};
|
173
|
-
};
|
174
|
-
|
175
|
-
exports.blocksHandler = blocksHandler;
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"names":["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","category","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"],"sources":["blocksHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { importBlock } 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 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, category, 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: category,\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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"}
|
@@ -1,180 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
4
|
-
value: true
|
5
|
-
});
|
6
|
-
exports.pagesHandler = void 0;
|
7
|
-
|
8
|
-
var _types = require("../../types");
|
9
|
-
|
10
|
-
var _utils = require("../utils");
|
11
|
-
|
12
|
-
var _client = require("../../client");
|
13
|
-
|
14
|
-
var _mockSecurity = require("../../mockSecurity");
|
15
|
-
|
16
|
-
var _utils2 = require("@webiny/utils");
|
17
|
-
|
18
|
-
const pagesHandler = async (configuration, payload, context) => {
|
19
|
-
const log = console.log;
|
20
|
-
let subTask;
|
21
|
-
let noPendingTask = true;
|
22
|
-
let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
|
23
|
-
log("RUNNING Import Page Queue Process");
|
24
|
-
const {
|
25
|
-
pageBuilder
|
26
|
-
} = context;
|
27
|
-
const {
|
28
|
-
taskId,
|
29
|
-
subTaskIndex,
|
30
|
-
type,
|
31
|
-
identity
|
32
|
-
} = payload; // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
|
33
|
-
// and this Lambda is invoked internally, without credentials.
|
34
|
-
|
35
|
-
(0, _mockSecurity.mockSecurity)(identity, context);
|
36
|
-
|
37
|
-
try {
|
38
|
-
/*
|
39
|
-
* Note: We're not going to DB for getting next sub-task to process,
|
40
|
-
* because the data might be out of sync due to GSI eventual consistency.
|
41
|
-
*/
|
42
|
-
subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
|
43
|
-
/**
|
44
|
-
* Base condition!!
|
45
|
-
* Bail out early, if task not found or task's status is not "pending".
|
46
|
-
*/
|
47
|
-
|
48
|
-
if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
|
49
|
-
noPendingTask = true;
|
50
|
-
return {
|
51
|
-
data: "",
|
52
|
-
error: null
|
53
|
-
};
|
54
|
-
} else {
|
55
|
-
noPendingTask = false;
|
56
|
-
}
|
57
|
-
|
58
|
-
prevStatusOfSubTask = subTask.status;
|
59
|
-
log(`Fetched sub task => ${subTask.id}`);
|
60
|
-
const {
|
61
|
-
pageKey,
|
62
|
-
category,
|
63
|
-
zipFileKey,
|
64
|
-
input
|
65
|
-
} = subTask.data;
|
66
|
-
const {
|
67
|
-
fileUploadsData
|
68
|
-
} = input;
|
69
|
-
log(`Processing page key "${pageKey}"`); // Mark task status as PROCESSING
|
70
|
-
|
71
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
72
|
-
status: _types.ImportExportTaskStatus.PROCESSING
|
73
|
-
}); // Update stats in main task
|
74
|
-
|
75
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
76
|
-
prevStatus: prevStatusOfSubTask,
|
77
|
-
nextStatus: _types.ImportExportTaskStatus.PROCESSING
|
78
|
-
});
|
79
|
-
prevStatusOfSubTask = subTask.status; // Real job
|
80
|
-
|
81
|
-
const page = await (0, _utils.importPage)({
|
82
|
-
context,
|
83
|
-
pageKey,
|
84
|
-
key: zipFileKey,
|
85
|
-
fileUploadsData
|
86
|
-
}); // Create a page
|
87
|
-
|
88
|
-
let pbPage = await context.pageBuilder.createPage(category); // Update page with data
|
89
|
-
|
90
|
-
pbPage = await context.pageBuilder.updatePage(pbPage.id, {
|
91
|
-
content: page.content,
|
92
|
-
title: page.title,
|
93
|
-
path: page.path,
|
94
|
-
settings: page.settings
|
95
|
-
}); // TODO: Publish page
|
96
|
-
// Update task record in DB
|
97
|
-
|
98
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
99
|
-
status: _types.ImportExportTaskStatus.COMPLETED,
|
100
|
-
data: {
|
101
|
-
message: "Done",
|
102
|
-
page: {
|
103
|
-
id: pbPage.id,
|
104
|
-
title: pbPage.title,
|
105
|
-
version: pbPage.version,
|
106
|
-
status: pbPage.status
|
107
|
-
}
|
108
|
-
}
|
109
|
-
}); // Update stats in main task
|
110
|
-
|
111
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
112
|
-
prevStatus: prevStatusOfSubTask,
|
113
|
-
nextStatus: _types.ImportExportTaskStatus.COMPLETED
|
114
|
-
});
|
115
|
-
prevStatusOfSubTask = subTask.status;
|
116
|
-
} catch (e) {
|
117
|
-
log("[IMPORT_PAGES_PROCESS] Error => ", e);
|
118
|
-
|
119
|
-
if (subTask && subTask.id) {
|
120
|
-
/**
|
121
|
-
* In case of error, we'll update the task status to "failed",
|
122
|
-
* so that, client can show notify the user appropriately.
|
123
|
-
*/
|
124
|
-
subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
|
125
|
-
status: _types.ImportExportTaskStatus.FAILED,
|
126
|
-
error: {
|
127
|
-
name: e.name,
|
128
|
-
message: e.message,
|
129
|
-
stack: e.stack,
|
130
|
-
code: "IMPORT_FAILED"
|
131
|
-
}
|
132
|
-
}); // Update stats in main task
|
133
|
-
|
134
|
-
await pageBuilder.importExportTask.updateStats(taskId, {
|
135
|
-
prevStatus: prevStatusOfSubTask,
|
136
|
-
nextStatus: _types.ImportExportTaskStatus.FAILED
|
137
|
-
});
|
138
|
-
prevStatusOfSubTask = subTask.status;
|
139
|
-
}
|
140
|
-
|
141
|
-
return {
|
142
|
-
data: null,
|
143
|
-
error: {
|
144
|
-
message: e.message
|
145
|
-
}
|
146
|
-
};
|
147
|
-
} finally {
|
148
|
-
// Base condition!
|
149
|
-
if (noPendingTask) {
|
150
|
-
log(`No pending sub-task for task ${taskId}`);
|
151
|
-
await pageBuilder.importExportTask.updateTask(taskId, {
|
152
|
-
status: _types.ImportExportTaskStatus.COMPLETED,
|
153
|
-
data: {
|
154
|
-
message: `Finish importing pages.`
|
155
|
-
}
|
156
|
-
});
|
157
|
-
} else {
|
158
|
-
log(`Invoking PROCESS for task "${subTaskIndex + 1}"`); // We want to continue with Self invocation no matter if current page error out.
|
159
|
-
|
160
|
-
await (0, _client.invokeHandlerClient)({
|
161
|
-
context,
|
162
|
-
name: configuration.handlers.process,
|
163
|
-
payload: {
|
164
|
-
taskId,
|
165
|
-
subTaskIndex: subTaskIndex + 1,
|
166
|
-
type,
|
167
|
-
identity: context.security.getIdentity()
|
168
|
-
},
|
169
|
-
description: "Import pages - process - subtask"
|
170
|
-
});
|
171
|
-
}
|
172
|
-
}
|
173
|
-
|
174
|
-
return {
|
175
|
-
data: "",
|
176
|
-
error: null
|
177
|
-
};
|
178
|
-
};
|
179
|
-
|
180
|
-
exports.pagesHandler = pagesHandler;
|
@@ -1 +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/import/utils.d.ts
DELETED
@@ -1,49 +0,0 @@
|
|
1
|
-
import { File } from "@webiny/api-file-manager/types";
|
2
|
-
import { PbImportExportContext } from "../graphql/types";
|
3
|
-
import { ExportedPageData, ExportedBlockData } from "../export/utils";
|
4
|
-
interface UploadAssetsParams {
|
5
|
-
context: PbImportExportContext;
|
6
|
-
filesData: File[];
|
7
|
-
fileUploadsData: FileUploadsData;
|
8
|
-
}
|
9
|
-
interface UploadAssetsReturnType {
|
10
|
-
fileIdToKeyMap: Map<string, string>;
|
11
|
-
}
|
12
|
-
export declare const uploadAssets: (params: UploadAssetsParams) => Promise<UploadAssetsReturnType>;
|
13
|
-
interface FileUploadsData {
|
14
|
-
data: string;
|
15
|
-
assets: Record<string, string>;
|
16
|
-
}
|
17
|
-
interface ImportPageParams {
|
18
|
-
key: string;
|
19
|
-
pageKey: string;
|
20
|
-
context: PbImportExportContext;
|
21
|
-
fileUploadsData: FileUploadsData;
|
22
|
-
}
|
23
|
-
export declare function importPage({ pageKey, context, fileUploadsData }: ImportPageParams): Promise<ExportedPageData["page"]>;
|
24
|
-
interface ImportBlockParams {
|
25
|
-
key: string;
|
26
|
-
blockKey: string;
|
27
|
-
context: PbImportExportContext;
|
28
|
-
fileUploadsData: FileUploadsData;
|
29
|
-
}
|
30
|
-
export declare function importBlock({ blockKey, context, fileUploadsData }: ImportBlockParams): Promise<ExportedBlockData["block"]>;
|
31
|
-
interface ImportData {
|
32
|
-
assets: Record<string, string>;
|
33
|
-
data: string;
|
34
|
-
key: string;
|
35
|
-
}
|
36
|
-
/**
|
37
|
-
* Function will read the given zip file from S3 via stream, extract its content and upload it to S3 bucket.
|
38
|
-
* @param zipFileUrl
|
39
|
-
* @return ImportData S3 file keys for all uploaded assets group by page/block.
|
40
|
-
*/
|
41
|
-
export declare function readExtractAndUploadZipFileContents(zipFileUrl: string): Promise<ImportData[]>;
|
42
|
-
export declare function initialStats(total: number): {
|
43
|
-
pending: number;
|
44
|
-
processing: number;
|
45
|
-
completed: number;
|
46
|
-
failed: number;
|
47
|
-
total: number;
|
48
|
-
};
|
49
|
-
export {};
|