@webiny/api-page-builder-import-export 0.0.0-unstable.e3f4727c56 → 0.0.0-unstable.ecd8734205

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.
Files changed (110) hide show
  1. package/export/combine/formsHandler.d.ts +6 -0
  2. package/export/combine/formsHandler.js +99 -0
  3. package/export/combine/formsHandler.js.map +1 -0
  4. package/export/combine/index.js +5 -0
  5. package/export/combine/index.js.map +1 -1
  6. package/export/process/formsHandler.d.ts +6 -0
  7. package/export/process/formsHandler.js +187 -0
  8. package/export/process/formsHandler.js.map +1 -0
  9. package/export/process/index.js +5 -0
  10. package/export/process/index.js.map +1 -1
  11. package/export/s3Stream.d.ts +5 -2
  12. package/export/s3Stream.js.map +1 -1
  13. package/export/utils.d.ts +8 -1
  14. package/export/utils.js +30 -2
  15. package/export/utils.js.map +1 -1
  16. package/export/zipper.js +2 -2
  17. package/export/zipper.js.map +1 -1
  18. package/graphql/crud/forms.crud.d.ts +4 -0
  19. package/graphql/crud/forms.crud.js +129 -0
  20. package/graphql/crud/forms.crud.js.map +1 -0
  21. package/graphql/crud.js +2 -1
  22. package/graphql/crud.js.map +1 -1
  23. package/graphql/graphql/forms.gql.d.ts +4 -0
  24. package/graphql/graphql/forms.gql.js +60 -0
  25. package/graphql/graphql/forms.gql.js.map +1 -0
  26. package/graphql/graphql.js +2 -1
  27. package/graphql/graphql.js.map +1 -1
  28. package/graphql/types.d.ts +23 -0
  29. package/graphql/types.js.map +1 -1
  30. package/import/constants.d.ts +3 -0
  31. package/import/constants.js +14 -0
  32. package/import/constants.js.map +1 -0
  33. package/import/create/blocksHandler.js +4 -3
  34. package/import/create/blocksHandler.js.map +1 -1
  35. package/import/create/formsHandler.d.ts +3 -0
  36. package/import/create/formsHandler.js +103 -0
  37. package/import/create/formsHandler.js.map +1 -0
  38. package/import/create/index.js +5 -0
  39. package/import/create/index.js.map +1 -1
  40. package/import/create/pagesHandler.js +3 -2
  41. package/import/create/pagesHandler.js.map +1 -1
  42. package/import/create/templatesHandler.js +2 -1
  43. package/import/create/templatesHandler.js.map +1 -1
  44. package/import/process/blocks/blocksHandler.d.ts +3 -0
  45. package/import/process/blocks/blocksHandler.js +169 -0
  46. package/import/process/blocks/blocksHandler.js.map +1 -0
  47. package/import/process/blocks/importBlock.d.ts +11 -0
  48. package/import/process/blocks/importBlock.js +89 -0
  49. package/import/process/blocks/importBlock.js.map +1 -0
  50. package/import/process/blocksHandler.js +26 -20
  51. package/import/process/blocksHandler.js.map +1 -1
  52. package/import/process/forms/formsHandler.d.ts +3 -0
  53. package/import/process/forms/formsHandler.js +176 -0
  54. package/import/process/forms/formsHandler.js.map +1 -0
  55. package/import/process/forms/importForm.d.ts +9 -0
  56. package/import/process/forms/importForm.js +43 -0
  57. package/import/process/forms/importForm.js.map +1 -0
  58. package/import/process/index.js +8 -3
  59. package/import/process/index.js.map +1 -1
  60. package/import/process/pages/importPage.d.ts +11 -0
  61. package/import/process/pages/importPage.js +92 -0
  62. package/import/process/pages/importPage.js.map +1 -0
  63. package/import/process/pages/pagesHandler.d.ts +3 -0
  64. package/import/process/pages/pagesHandler.js +183 -0
  65. package/import/process/pages/pagesHandler.js.map +1 -0
  66. package/import/process/pagesHandler.js +29 -32
  67. package/import/process/pagesHandler.js.map +1 -1
  68. package/import/process/templates/importTemplate.d.ts +11 -0
  69. package/import/process/templates/importTemplate.js +66 -0
  70. package/import/process/templates/importTemplate.js.map +1 -0
  71. package/import/process/{templatesHandler.d.ts → templates/templatesHandler.d.ts} +2 -2
  72. package/import/process/{templatesHandler.js → templates/templatesHandler.js} +8 -7
  73. package/import/process/templates/templatesHandler.js.map +1 -0
  74. package/import/utils/deleteS3Folder.d.ts +1 -0
  75. package/import/utils/deleteS3Folder.js +19 -0
  76. package/import/utils/deleteS3Folder.js.map +1 -0
  77. package/import/utils/extractAndUploadZipFileContents.d.ts +7 -0
  78. package/import/utils/extractAndUploadZipFileContents.js +122 -0
  79. package/import/utils/extractAndUploadZipFileContents.js.map +1 -0
  80. package/import/utils/extractZipAndUploadToS3.d.ts +2 -0
  81. package/import/utils/extractZipAndUploadToS3.js +98 -0
  82. package/import/utils/extractZipAndUploadToS3.js.map +1 -0
  83. package/import/utils/getFileNameWithoutExt.d.ts +1 -0
  84. package/import/utils/getFileNameWithoutExt.js +11 -0
  85. package/import/utils/getFileNameWithoutExt.js.map +1 -0
  86. package/import/utils/index.d.ts +9 -0
  87. package/import/utils/index.js +104 -0
  88. package/import/utils/index.js.map +1 -0
  89. package/import/utils/initialStats.d.ts +7 -0
  90. package/import/utils/initialStats.js +16 -0
  91. package/import/utils/initialStats.js.map +1 -0
  92. package/import/utils/prepareDataDirMap.d.ts +6 -0
  93. package/import/utils/prepareDataDirMap.js +29 -0
  94. package/import/utils/prepareDataDirMap.js.map +1 -0
  95. package/import/utils/updateFilesInData.d.ts +8 -0
  96. package/import/utils/updateFilesInData.js +48 -0
  97. package/import/utils/updateFilesInData.js.map +1 -0
  98. package/import/utils/uploadAssets.d.ts +10 -0
  99. package/import/utils/uploadAssets.js +58 -0
  100. package/import/utils/uploadAssets.js.map +1 -0
  101. package/import/utils/uploadFilesFromS3.d.ts +3 -0
  102. package/import/utils/uploadFilesFromS3.js +19 -0
  103. package/import/utils/uploadFilesFromS3.js.map +1 -0
  104. package/import/utils.d.ts +1 -8
  105. package/import/utils.js +137 -103
  106. package/import/utils.js.map +1 -1
  107. package/package.json +23 -22
  108. package/types.d.ts +21 -0
  109. package/types.js.map +1 -1
  110. package/import/process/templatesHandler.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"names":["configuration","createRawEventHandler","payload","context","type","blocksHandler","templatesHandler","pagesHandler"],"sources":["index.ts"],"sourcesContent":["import { ImportExportTask, PbImportExportContext } from \"~/types\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/import/create/blocksHandler\";\nimport { pagesHandler } from \"~/import/create/pagesHandler\";\nimport { templatesHandler } from \"~/import/create/templatesHandler\";\n\nexport interface Configuration {\n handlers: {\n process: string;\n };\n}\n\nexport interface Payload {\n category?: string;\n zipFileUrl: string;\n task: ImportExportTask;\n type: string;\n identity: SecurityIdentity;\n meta?: Record<string, any>;\n}\nexport interface Response {\n data: string | null;\n error: Partial<Error> | null;\n}\n\n/**\n * Handles the import page workflow.\n */\nexport default (configuration: Configuration) => {\n return createRawEventHandler<Payload, PbImportExportContext, Response>(\n async ({ payload, context }) => {\n switch (payload.type) {\n case \"block\": {\n return await blocksHandler(configuration, payload, context);\n }\n case \"template\": {\n return await templatesHandler(configuration, payload, context);\n }\n default: {\n return await pagesHandler(configuration, payload, context);\n }\n }\n }\n );\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AAqBA;AACA;AACA;AAFA,eAGgBA,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,QAAQD,OAAO,CAACE,IAAI;MAChB,KAAK,OAAO;QAAE;UACV,OAAO,MAAM,IAAAC,4BAAa,EAACL,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC/D;MACA,KAAK,UAAU;QAAE;UACb,OAAO,MAAM,IAAAG,kCAAgB,EAACN,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAClE;MACA;QAAS;UACL,OAAO,MAAM,IAAAI,0BAAY,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC9D;IAAC;EAET,CAAC,CACJ;AACL,CAAC;AAAA"}
1
+ {"version":3,"names":["configuration","createRawEventHandler","payload","context","type","blocksHandler","formsHandler","templatesHandler","pagesHandler"],"sources":["index.ts"],"sourcesContent":["import { ImportExportTask, PbImportExportContext } from \"~/types\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/import/create/blocksHandler\";\nimport { formsHandler } from \"~/import/create/formsHandler\";\nimport { pagesHandler } from \"~/import/create/pagesHandler\";\nimport { templatesHandler } from \"~/import/create/templatesHandler\";\n\nexport interface Configuration {\n handlers: {\n process: string;\n };\n}\n\nexport interface Payload {\n category?: string;\n zipFileUrl: string;\n task: ImportExportTask;\n type: string;\n identity: SecurityIdentity;\n meta?: Record<string, any>;\n}\nexport interface Response {\n data: string | null;\n error: Partial<Error> | null;\n}\n\n/**\n * Handles the import page workflow.\n */\nexport default (configuration: Configuration) => {\n return createRawEventHandler<Payload, PbImportExportContext, Response>(\n async ({ payload, context }) => {\n switch (payload.type) {\n case \"block\": {\n return await blocksHandler(configuration, payload, context);\n }\n case \"form\": {\n return await formsHandler(configuration, payload, context);\n }\n case \"template\": {\n return await templatesHandler(configuration, payload, context);\n }\n default: {\n return await pagesHandler(configuration, payload, context);\n }\n }\n }\n );\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AAqBA;AACA;AACA;AAFA,eAGgBA,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,QAAQD,OAAO,CAACE,IAAI;MAChB,KAAK,OAAO;QAAE;UACV,OAAO,MAAM,IAAAC,4BAAa,EAACL,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC/D;MACA,KAAK,MAAM;QAAE;UACT,OAAO,MAAM,IAAAG,0BAAY,EAACN,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC9D;MACA,KAAK,UAAU;QAAE;UACb,OAAO,MAAM,IAAAI,kCAAgB,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAClE;MACA;QAAS;UACL,OAAO,MAAM,IAAAK,0BAAY,EAACR,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC9D;IAAC;EAET,CAAC,CACJ;AACL,CAAC;AAAA"}
@@ -9,6 +9,7 @@ var _utils = require("../utils");
9
9
  var _client = require("../../client");
10
10
  var _mockSecurity = require("../../mockSecurity");
11
11
  var _utils2 = require("@webiny/utils");
12
+ var _extractAndUploadZipFileContents = require("../utils/extractAndUploadZipFileContents");
12
13
  const pagesHandler = async (configuration, payload, context) => {
13
14
  const log = console.log;
14
15
  const {
@@ -34,12 +35,12 @@ const pagesHandler = async (configuration, payload, context) => {
34
35
  }
35
36
  (0, _mockSecurity.mockSecurity)(identity, context);
36
37
  // Step 1: Read the zip file
37
- const pageImportDataList = await (0, _utils.readExtractAndUploadZipFileContents)(zipFileUrl);
38
+ const pageImportDataList = await (0, _extractAndUploadZipFileContents.extractAndUploadZipFileContents)(zipFileUrl);
38
39
 
39
40
  // For each page create a subtask and invoke the process handler
40
41
  for (let i = 0; i < pageImportDataList.length; i++) {
41
42
  const pagesDirMap = pageImportDataList[i];
42
- // Create sub task
43
+ // Create sub-task
43
44
  const subtask = await pageBuilder.importExportTask.createSubTask(task.id, (0, _utils2.zeroPad)(i + 1, 5), {
44
45
  status: _types.ImportExportTaskStatus.PENDING,
45
46
  data: {
@@ -1 +1 @@
1
- {"version":3,"names":["pagesHandler","configuration","payload","context","log","console","pageBuilder","task","type","category","zipFileUrl","identity","meta","data","error","message","mockSecurity","pageImportDataList","readExtractAndUploadZipFileContents","i","length","pagesDirMap","subtask","importExportTask","createSubTask","id","zeroPad","status","ImportExportTaskStatus","PENDING","pageKey","key","input","fileUploadsData","updateTask","PROCESSING","stats","initialStats","invokeHandlerClient","name","handlers","process","taskId","subTaskIndex","security","getIdentity","description","e","FAILED","code"],"sources":["pagesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { initialStats, readExtractAndUploadZipFileContents } from \"~/import/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { Payload as ProcessPayload } from \"../process\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/create\";\n\nexport const pagesHandler = async (\n configuration: Configuration,\n payload: Payload,\n context: PbImportExportContext\n): Promise<Response> => {\n const log = console.log;\n\n const { pageBuilder } = context;\n const { task, type, category, zipFileUrl, identity, meta } = payload;\n try {\n log(\"RUNNING Import Pages Create\");\n if (!zipFileUrl) {\n return {\n data: null,\n error: {\n message: `Missing \"zipFileUrl\"!`\n }\n };\n }\n mockSecurity(identity, context);\n // Step 1: Read the zip file\n const pageImportDataList = await readExtractAndUploadZipFileContents(zipFileUrl);\n\n // For each page create a subtask and invoke the process handler\n for (let i = 0; i < pageImportDataList.length; i++) {\n const pagesDirMap = pageImportDataList[i];\n // Create sub task\n const subtask = await pageBuilder.importExportTask.createSubTask(\n task.id,\n zeroPad(i + 1, 5),\n {\n status: ImportExportTaskStatus.PENDING,\n data: {\n pageKey: pagesDirMap.key,\n category,\n zipFileUrl,\n meta,\n input: {\n fileUploadsData: pagesDirMap\n }\n }\n }\n );\n log(`Added SUB_TASK \"${subtask.id}\" to queue.`);\n }\n // Update main task status\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.PROCESSING,\n stats: initialStats(pageImportDataList.length)\n });\n\n await invokeHandlerClient<ProcessPayload>({\n context,\n name: configuration.handlers.process,\n payload: {\n taskId: task.id,\n // Execute \"Process\" for the first sub task.\n subTaskIndex: 1,\n type,\n identity: context.security.getIdentity()\n },\n description: \"Import pages - process - first\"\n });\n } catch (e) {\n log(\"[IMPORT_PAGES_CREATE] Error => \", e);\n\n /**\n * In case of error, we'll update the task status to \"failed\",\n * so that, client can show notify the user appropriately.\n */\n\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.FAILED,\n error: {\n name: e.name,\n message: e.message,\n code: e.code || \"EXPORT_FAILED\"\n }\n });\n\n return {\n data: null,\n error: {\n message: e.message\n }\n };\n }\n\n return {\n data: \"\",\n error: null\n };\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["pagesHandler","configuration","payload","context","log","console","pageBuilder","task","type","category","zipFileUrl","identity","meta","data","error","message","mockSecurity","pageImportDataList","extractAndUploadZipFileContents","i","length","pagesDirMap","subtask","importExportTask","createSubTask","id","zeroPad","status","ImportExportTaskStatus","PENDING","pageKey","key","input","fileUploadsData","updateTask","PROCESSING","stats","initialStats","invokeHandlerClient","name","handlers","process","taskId","subTaskIndex","security","getIdentity","description","e","FAILED","code"],"sources":["pagesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { initialStats } from \"~/import/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { Payload as ProcessPayload } from \"../process\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/create\";\nimport { extractAndUploadZipFileContents } from \"~/import/utils/extractAndUploadZipFileContents\";\n\nexport const pagesHandler = async (\n configuration: Configuration,\n payload: Payload,\n context: PbImportExportContext\n): Promise<Response> => {\n const log = console.log;\n\n const { pageBuilder } = context;\n const { task, type, category, zipFileUrl, identity, meta } = payload;\n try {\n log(\"RUNNING Import Pages Create\");\n if (!zipFileUrl) {\n return {\n data: null,\n error: {\n message: `Missing \"zipFileUrl\"!`\n }\n };\n }\n mockSecurity(identity, context);\n // Step 1: Read the zip file\n const pageImportDataList = await extractAndUploadZipFileContents(zipFileUrl);\n\n // For each page create a subtask and invoke the process handler\n for (let i = 0; i < pageImportDataList.length; i++) {\n const pagesDirMap = pageImportDataList[i];\n // Create sub-task\n const subtask = await pageBuilder.importExportTask.createSubTask(\n task.id,\n zeroPad(i + 1, 5),\n {\n status: ImportExportTaskStatus.PENDING,\n data: {\n pageKey: pagesDirMap.key,\n category,\n zipFileUrl,\n meta,\n input: {\n fileUploadsData: pagesDirMap\n }\n }\n }\n );\n log(`Added SUB_TASK \"${subtask.id}\" to queue.`);\n }\n // Update main task status\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.PROCESSING,\n stats: initialStats(pageImportDataList.length)\n });\n\n await invokeHandlerClient<ProcessPayload>({\n context,\n name: configuration.handlers.process,\n payload: {\n taskId: task.id,\n // Execute \"Process\" for the first sub task.\n subTaskIndex: 1,\n type,\n identity: context.security.getIdentity()\n },\n description: \"Import pages - process - first\"\n });\n } catch (e) {\n log(\"[IMPORT_PAGES_CREATE] Error => \", e);\n\n /**\n * In case of error, we'll update the task status to \"failed\",\n * so that, client can show notify the user appropriately.\n */\n\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.FAILED,\n error: {\n name: e.name,\n message: e.message,\n code: e.code || \"EXPORT_FAILED\"\n }\n });\n\n return {\n data: null,\n error: {\n message: e.message\n }\n };\n }\n\n return {\n data: \"\",\n error: null\n };\n};\n"],"mappings":"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"}
@@ -9,6 +9,7 @@ var _utils = require("../utils");
9
9
  var _client = require("../../client");
10
10
  var _mockSecurity = require("../../mockSecurity");
11
11
  var _utils2 = require("@webiny/utils");
12
+ var _extractAndUploadZipFileContents = require("../utils/extractAndUploadZipFileContents");
12
13
  const templatesHandler = async (configuration, payload, context) => {
13
14
  const log = console.log;
14
15
  const {
@@ -32,7 +33,7 @@ const templatesHandler = async (configuration, payload, context) => {
32
33
  }
33
34
  (0, _mockSecurity.mockSecurity)(identity, context);
34
35
  // Step 1: Read the zip file
35
- const templateImportDataList = await (0, _utils.readExtractAndUploadZipFileContents)(zipFileUrl);
36
+ const templateImportDataList = await (0, _extractAndUploadZipFileContents.extractAndUploadZipFileContents)(zipFileUrl);
36
37
 
37
38
  // For each template create a subtask and invoke the process handler
38
39
  for (let i = 0; i < templateImportDataList.length; i++) {
@@ -1 +1 @@
1
- {"version":3,"names":["templatesHandler","configuration","payload","context","log","console","pageBuilder","task","type","zipFileUrl","identity","data","error","message","mockSecurity","templateImportDataList","readExtractAndUploadZipFileContents","i","length","templatesDirMap","subtask","importExportTask","createSubTask","id","zeroPad","status","ImportExportTaskStatus","PENDING","templateKey","key","input","fileUploadsData","updateTask","PROCESSING","stats","initialStats","invokeHandlerClient","name","handlers","process","taskId","subTaskIndex","security","getIdentity","description","e","FAILED","code"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { initialStats, readExtractAndUploadZipFileContents } from \"~/import/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { Payload as ProcessPayload } from \"../process\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/create\";\n\nexport const templatesHandler = async (\n configuration: Configuration,\n payload: Payload,\n context: PbImportExportContext\n): Promise<Response> => {\n const log = console.log;\n\n const { pageBuilder } = context;\n const { task, type, zipFileUrl, identity } = payload;\n try {\n log(\"RUNNING Import Templates Create\");\n if (!zipFileUrl) {\n return {\n data: null,\n error: {\n message: `Missing \"zipFileUrl\"!`\n }\n };\n }\n mockSecurity(identity, context);\n // Step 1: Read the zip file\n const templateImportDataList = await readExtractAndUploadZipFileContents(zipFileUrl);\n\n // For each template create a subtask and invoke the process handler\n for (let i = 0; i < templateImportDataList.length; i++) {\n const templatesDirMap = templateImportDataList[i];\n // Create sub task\n const subtask = await pageBuilder.importExportTask.createSubTask(\n task.id,\n zeroPad(i + 1, 5),\n {\n status: ImportExportTaskStatus.PENDING,\n data: {\n templateKey: templatesDirMap.key,\n zipFileUrl,\n input: {\n fileUploadsData: templatesDirMap\n }\n }\n }\n );\n log(`Added SUB_TASK \"${subtask.id}\" to queue.`);\n }\n // Update main task status\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.PROCESSING,\n stats: initialStats(templateImportDataList.length)\n });\n\n await invokeHandlerClient<ProcessPayload>({\n context,\n name: configuration.handlers.process,\n payload: {\n taskId: task.id,\n // Execute \"Process\" for the first sub task.\n subTaskIndex: 1,\n type,\n identity: context.security.getIdentity()\n },\n description: \"Import templates - process - first\"\n });\n } catch (e) {\n log(\"[IMPORT_TEMPLATES_CREATE] Error => \", e);\n\n /**\n * In case of error, we'll update the task status to \"failed\",\n * so that, client can show notify the user appropriately.\n */\n\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.FAILED,\n error: {\n name: e.name,\n message: e.message,\n code: e.code || \"EXPORT_FAILED\"\n }\n });\n\n return {\n data: null,\n error: {\n message: e.message\n }\n };\n }\n\n return {\n data: \"\",\n error: null\n };\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAEA;AACA;AAGO,MAAMA,gBAAgB,GAAG,OAC5BC,aAA4B,EAC5BC,OAAgB,EAChBC,OAA8B,KACV;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;EAEvB,MAAM;IAAEE;EAAY,CAAC,GAAGH,OAAO;EAC/B,MAAM;IAAEI,IAAI;IAAEC,IAAI;IAAEC,UAAU;IAAEC;EAAS,CAAC,GAAGR,OAAO;EACpD,IAAI;IACAE,GAAG,CAAC,iCAAiC,CAAC;IACtC,IAAI,CAACK,UAAU,EAAE;MACb,OAAO;QACHE,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAG;QACd;MACJ,CAAC;IACL;IACA,IAAAC,0BAAY,EAACJ,QAAQ,EAAEP,OAAO,CAAC;IAC/B;IACA,MAAMY,sBAAsB,GAAG,MAAM,IAAAC,0CAAmC,EAACP,UAAU,CAAC;;IAEpF;IACA,KAAK,IAAIQ,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,sBAAsB,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;MACpD,MAAME,eAAe,GAAGJ,sBAAsB,CAACE,CAAC,CAAC;MACjD;MACA,MAAMG,OAAO,GAAG,MAAMd,WAAW,CAACe,gBAAgB,CAACC,aAAa,CAC5Df,IAAI,CAACgB,EAAE,EACP,IAAAC,eAAO,EAACP,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EACjB;QACIQ,MAAM,EAAEC,6BAAsB,CAACC,OAAO;QACtChB,IAAI,EAAE;UACFiB,WAAW,EAAET,eAAe,CAACU,GAAG;UAChCpB,UAAU;UACVqB,KAAK,EAAE;YACHC,eAAe,EAAEZ;UACrB;QACJ;MACJ,CAAC,CACJ;MACDf,GAAG,CAAE,mBAAkBgB,OAAO,CAACG,EAAG,aAAY,CAAC;IACnD;IACA;IACA,MAAMjB,WAAW,CAACe,gBAAgB,CAACW,UAAU,CAACzB,IAAI,CAACgB,EAAE,EAAE;MACnDE,MAAM,EAAEC,6BAAsB,CAACO,UAAU;MACzCC,KAAK,EAAE,IAAAC,mBAAY,EAACpB,sBAAsB,CAACG,MAAM;IACrD,CAAC,CAAC;IAEF,MAAM,IAAAkB,2BAAmB,EAAiB;MACtCjC,OAAO;MACPkC,IAAI,EAAEpC,aAAa,CAACqC,QAAQ,CAACC,OAAO;MACpCrC,OAAO,EAAE;QACLsC,MAAM,EAAEjC,IAAI,CAACgB,EAAE;QACf;QACAkB,YAAY,EAAE,CAAC;QACfjC,IAAI;QACJE,QAAQ,EAAEP,OAAO,CAACuC,QAAQ,CAACC,WAAW;MAC1C,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,OAAOC,CAAC,EAAE;IACRzC,GAAG,CAAC,qCAAqC,EAAEyC,CAAC,CAAC;;IAE7C;AACR;AACA;AACA;;IAEQ,MAAMvC,WAAW,CAACe,gBAAgB,CAACW,UAAU,CAACzB,IAAI,CAACgB,EAAE,EAAE;MACnDE,MAAM,EAAEC,6BAAsB,CAACoB,MAAM;MACrClC,KAAK,EAAE;QACHyB,IAAI,EAAEQ,CAAC,CAACR,IAAI;QACZxB,OAAO,EAAEgC,CAAC,CAAChC,OAAO;QAClBkC,IAAI,EAAEF,CAAC,CAACE,IAAI,IAAI;MACpB;IACJ,CAAC,CAAC;IAEF,OAAO;MACHpC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAEgC,CAAC,CAAChC;MACf;IACJ,CAAC;EACL;EAEA,OAAO;IACHF,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE;EACX,CAAC;AACL,CAAC;AAAC"}
1
+ {"version":3,"names":["templatesHandler","configuration","payload","context","log","console","pageBuilder","task","type","zipFileUrl","identity","data","error","message","mockSecurity","templateImportDataList","extractAndUploadZipFileContents","i","length","templatesDirMap","subtask","importExportTask","createSubTask","id","zeroPad","status","ImportExportTaskStatus","PENDING","templateKey","key","input","fileUploadsData","updateTask","PROCESSING","stats","initialStats","invokeHandlerClient","name","handlers","process","taskId","subTaskIndex","security","getIdentity","description","e","FAILED","code"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { initialStats } from \"~/import/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { Payload as ProcessPayload } from \"../process\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/import/create\";\nimport { extractAndUploadZipFileContents } from \"~/import/utils/extractAndUploadZipFileContents\";\n\nexport const templatesHandler = async (\n configuration: Configuration,\n payload: Payload,\n context: PbImportExportContext\n): Promise<Response> => {\n const log = console.log;\n\n const { pageBuilder } = context;\n const { task, type, zipFileUrl, identity } = payload;\n try {\n log(\"RUNNING Import Templates Create\");\n if (!zipFileUrl) {\n return {\n data: null,\n error: {\n message: `Missing \"zipFileUrl\"!`\n }\n };\n }\n mockSecurity(identity, context);\n // Step 1: Read the zip file\n const templateImportDataList = await extractAndUploadZipFileContents(zipFileUrl);\n\n // For each template create a subtask and invoke the process handler\n for (let i = 0; i < templateImportDataList.length; i++) {\n const templatesDirMap = templateImportDataList[i];\n // Create sub task\n const subtask = await pageBuilder.importExportTask.createSubTask(\n task.id,\n zeroPad(i + 1, 5),\n {\n status: ImportExportTaskStatus.PENDING,\n data: {\n templateKey: templatesDirMap.key,\n zipFileUrl,\n input: {\n fileUploadsData: templatesDirMap\n }\n }\n }\n );\n log(`Added SUB_TASK \"${subtask.id}\" to queue.`);\n }\n // Update main task status\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.PROCESSING,\n stats: initialStats(templateImportDataList.length)\n });\n\n await invokeHandlerClient<ProcessPayload>({\n context,\n name: configuration.handlers.process,\n payload: {\n taskId: task.id,\n // Execute \"Process\" for the first sub task.\n subTaskIndex: 1,\n type,\n identity: context.security.getIdentity()\n },\n description: \"Import templates - process - first\"\n });\n } catch (e) {\n log(\"[IMPORT_TEMPLATES_CREATE] Error => \", e);\n\n /**\n * In case of error, we'll update the task status to \"failed\",\n * so that, client can show notify the user appropriately.\n */\n\n await pageBuilder.importExportTask.updateTask(task.id, {\n status: ImportExportTaskStatus.FAILED,\n error: {\n name: e.name,\n message: e.message,\n code: e.code || \"EXPORT_FAILED\"\n }\n });\n\n return {\n data: null,\n error: {\n message: e.message\n }\n };\n }\n\n return {\n data: \"\",\n error: null\n };\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAEA;AACA;AAEA;AAEO,MAAMA,gBAAgB,GAAG,OAC5BC,aAA4B,EAC5BC,OAAgB,EAChBC,OAA8B,KACV;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;EAEvB,MAAM;IAAEE;EAAY,CAAC,GAAGH,OAAO;EAC/B,MAAM;IAAEI,IAAI;IAAEC,IAAI;IAAEC,UAAU;IAAEC;EAAS,CAAC,GAAGR,OAAO;EACpD,IAAI;IACAE,GAAG,CAAC,iCAAiC,CAAC;IACtC,IAAI,CAACK,UAAU,EAAE;MACb,OAAO;QACHE,IAAI,EAAE,IAAI;QACVC,KAAK,EAAE;UACHC,OAAO,EAAG;QACd;MACJ,CAAC;IACL;IACA,IAAAC,0BAAY,EAACJ,QAAQ,EAAEP,OAAO,CAAC;IAC/B;IACA,MAAMY,sBAAsB,GAAG,MAAM,IAAAC,gEAA+B,EAACP,UAAU,CAAC;;IAEhF;IACA,KAAK,IAAIQ,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,sBAAsB,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;MACpD,MAAME,eAAe,GAAGJ,sBAAsB,CAACE,CAAC,CAAC;MACjD;MACA,MAAMG,OAAO,GAAG,MAAMd,WAAW,CAACe,gBAAgB,CAACC,aAAa,CAC5Df,IAAI,CAACgB,EAAE,EACP,IAAAC,eAAO,EAACP,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EACjB;QACIQ,MAAM,EAAEC,6BAAsB,CAACC,OAAO;QACtChB,IAAI,EAAE;UACFiB,WAAW,EAAET,eAAe,CAACU,GAAG;UAChCpB,UAAU;UACVqB,KAAK,EAAE;YACHC,eAAe,EAAEZ;UACrB;QACJ;MACJ,CAAC,CACJ;MACDf,GAAG,CAAE,mBAAkBgB,OAAO,CAACG,EAAG,aAAY,CAAC;IACnD;IACA;IACA,MAAMjB,WAAW,CAACe,gBAAgB,CAACW,UAAU,CAACzB,IAAI,CAACgB,EAAE,EAAE;MACnDE,MAAM,EAAEC,6BAAsB,CAACO,UAAU;MACzCC,KAAK,EAAE,IAAAC,mBAAY,EAACpB,sBAAsB,CAACG,MAAM;IACrD,CAAC,CAAC;IAEF,MAAM,IAAAkB,2BAAmB,EAAiB;MACtCjC,OAAO;MACPkC,IAAI,EAAEpC,aAAa,CAACqC,QAAQ,CAACC,OAAO;MACpCrC,OAAO,EAAE;QACLsC,MAAM,EAAEjC,IAAI,CAACgB,EAAE;QACf;QACAkB,YAAY,EAAE,CAAC;QACfjC,IAAI;QACJE,QAAQ,EAAEP,OAAO,CAACuC,QAAQ,CAACC,WAAW;MAC1C,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,OAAOC,CAAC,EAAE;IACRzC,GAAG,CAAC,qCAAqC,EAAEyC,CAAC,CAAC;;IAE7C;AACR;AACA;AACA;;IAEQ,MAAMvC,WAAW,CAACe,gBAAgB,CAACW,UAAU,CAACzB,IAAI,CAACgB,EAAE,EAAE;MACnDE,MAAM,EAAEC,6BAAsB,CAACoB,MAAM;MACrClC,KAAK,EAAE;QACHyB,IAAI,EAAEQ,CAAC,CAACR,IAAI;QACZxB,OAAO,EAAEgC,CAAC,CAAChC,OAAO;QAClBkC,IAAI,EAAEF,CAAC,CAACE,IAAI,IAAI;MACpB;IACJ,CAAC,CAAC;IAEF,OAAO;MACHpC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAEgC,CAAC,CAAChC;MACf;IACJ,CAAC;EACL;EAEA,OAAO;IACHF,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE;EACX,CAAC;AACL,CAAC;AAAC"}
@@ -0,0 +1,3 @@
1
+ import { PbImportExportContext } from "../../../types";
2
+ import { Configuration, Payload, Response } from "..";
3
+ export declare const blocksHandler: (configuration: Configuration, payload: Payload, context: PbImportExportContext) => Promise<Response>;
@@ -0,0 +1,169 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.blocksHandler = void 0;
7
+ var _types = require("../../../types");
8
+ var _client = require("../../../client");
9
+ var _mockSecurity = require("../../../mockSecurity");
10
+ var _utils = require("@webiny/utils");
11
+ var _importBlock = require("./importBlock");
12
+ const blocksHandler = async (configuration, payload, context) => {
13
+ const log = console.log;
14
+ let subTask;
15
+ let noPendingTask = true;
16
+ let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
17
+ log("RUNNING Import Block Queue Process");
18
+ const {
19
+ pageBuilder
20
+ } = context;
21
+ const {
22
+ taskId,
23
+ subTaskIndex,
24
+ type,
25
+ identity
26
+ } = payload;
27
+ // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
28
+ // and this Lambda is invoked internally, without credentials.
29
+ (0, _mockSecurity.mockSecurity)(identity, context);
30
+ try {
31
+ /*
32
+ * Note: We're not going to DB for getting next sub-task to process,
33
+ * because the data might be out of sync due to GSI eventual consistency.
34
+ */
35
+
36
+ subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
37
+
38
+ /**
39
+ * Base condition!!
40
+ * Bail out early, if task not found or task's status is not "pending".
41
+ */
42
+ if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
43
+ noPendingTask = true;
44
+ return {
45
+ data: "",
46
+ error: null
47
+ };
48
+ } else {
49
+ noPendingTask = false;
50
+ }
51
+ prevStatusOfSubTask = subTask.status;
52
+ log(`Fetched sub task => ${subTask.id}`);
53
+ console.log("subTask", subTask);
54
+ const {
55
+ blockKey,
56
+ category,
57
+ zipFileKey,
58
+ input
59
+ } = subTask.data;
60
+ const {
61
+ fileUploadsData
62
+ } = input;
63
+ log(`Processing block key "${blockKey}"`);
64
+
65
+ // Mark task status as PROCESSING
66
+ subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
67
+ status: _types.ImportExportTaskStatus.PROCESSING
68
+ });
69
+ // Update stats in main task
70
+ await pageBuilder.importExportTask.updateStats(taskId, {
71
+ prevStatus: prevStatusOfSubTask,
72
+ nextStatus: _types.ImportExportTaskStatus.PROCESSING
73
+ });
74
+ prevStatusOfSubTask = subTask.status;
75
+
76
+ // Real job
77
+ const block = await (0, _importBlock.importBlock)({
78
+ context,
79
+ blockKey,
80
+ key: zipFileKey,
81
+ fileUploadsData
82
+ });
83
+
84
+ // Create a block
85
+ const pbBlock = await context.pageBuilder.createPageBlock({
86
+ name: block.name,
87
+ blockCategory: category,
88
+ content: block.content,
89
+ preview: block.preview
90
+ });
91
+
92
+ // Update task record in DB
93
+ subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
94
+ status: _types.ImportExportTaskStatus.COMPLETED,
95
+ data: {
96
+ message: "Done",
97
+ block: {
98
+ id: pbBlock.id,
99
+ name: pbBlock.name
100
+ }
101
+ }
102
+ });
103
+ // Update stats in main task
104
+ await pageBuilder.importExportTask.updateStats(taskId, {
105
+ prevStatus: prevStatusOfSubTask,
106
+ nextStatus: _types.ImportExportTaskStatus.COMPLETED
107
+ });
108
+ prevStatusOfSubTask = subTask.status;
109
+ } catch (e) {
110
+ log("[IMPORT_BLOCKS_PROCESS] Error => ", e.message);
111
+ if (subTask && subTask.id) {
112
+ /**
113
+ * In case of error, we'll update the task status to "failed",
114
+ * so that, client can show notify the user appropriately.
115
+ */
116
+ subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
117
+ status: _types.ImportExportTaskStatus.FAILED,
118
+ error: {
119
+ name: e.name,
120
+ message: e.message,
121
+ code: "IMPORT_FAILED"
122
+ }
123
+ });
124
+
125
+ // Update stats in main task
126
+ await pageBuilder.importExportTask.updateStats(taskId, {
127
+ prevStatus: prevStatusOfSubTask,
128
+ nextStatus: _types.ImportExportTaskStatus.FAILED
129
+ });
130
+ prevStatusOfSubTask = subTask.status;
131
+ }
132
+ return {
133
+ data: null,
134
+ error: {
135
+ message: e.message
136
+ }
137
+ };
138
+ } finally {
139
+ // Base condition!
140
+ if (noPendingTask) {
141
+ log(`No pending sub-task for task ${taskId}`);
142
+ await pageBuilder.importExportTask.updateTask(taskId, {
143
+ status: _types.ImportExportTaskStatus.COMPLETED,
144
+ data: {
145
+ message: `Finish importing blocks.`
146
+ }
147
+ });
148
+ } else {
149
+ log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
150
+ // We want to continue with Self invocation no matter if current block error out.
151
+ await (0, _client.invokeHandlerClient)({
152
+ context,
153
+ name: configuration.handlers.process,
154
+ payload: {
155
+ taskId,
156
+ subTaskIndex: subTaskIndex + 1,
157
+ type,
158
+ identity: context.security.getIdentity()
159
+ },
160
+ description: "Import blocks - process - subtask"
161
+ });
162
+ }
163
+ }
164
+ return {
165
+ data: "",
166
+ error: null
167
+ };
168
+ };
169
+ exports.blocksHandler = blocksHandler;
@@ -0,0 +1 @@
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 { 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, 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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"}
@@ -0,0 +1,11 @@
1
+ import { PbImportExportContext } from "../../../graphql/types";
2
+ import { FileUploadsData } from "../../../types";
3
+ import { ExportedBlockData } from "../../../export/utils";
4
+ interface ImportBlockParams {
5
+ key: string;
6
+ blockKey: string;
7
+ context: PbImportExportContext;
8
+ fileUploadsData: FileUploadsData;
9
+ }
10
+ export declare function importBlock({ blockKey, context, fileUploadsData }: ImportBlockParams): Promise<ExportedBlockData["block"]>;
11
+ export {};
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.importBlock = importBlock;
8
+ var _path = _interopRequireDefault(require("path"));
9
+ var _dotPropImmutable = _interopRequireDefault(require("dot-prop-immutable"));
10
+ var _loadJsonFile = _interopRequireDefault(require("load-json-file"));
11
+ var _fsExtra = require("fs-extra");
12
+ var _s3Stream = require("../../../export/s3Stream");
13
+ var _uploadAssets = require("../../utils/uploadAssets");
14
+ var _downloadInstallFiles = require("@webiny/api-page-builder/graphql/crud/install/utils/downloadInstallFiles");
15
+ var _deleteS3Folder = require("../../utils/deleteS3Folder");
16
+ var _updateFilesInData = require("../../utils/updateFilesInData");
17
+ var _constants = require("../../constants");
18
+ async function importBlock({
19
+ blockKey,
20
+ context,
21
+ fileUploadsData
22
+ }) {
23
+ const log = console.log;
24
+
25
+ // Making Directory for block in which we're going to extract the block data file.
26
+ const BLOCK_EXTRACT_DIR = _path.default.join(_constants.INSTALL_EXTRACT_DIR, blockKey);
27
+ (0, _fsExtra.ensureDirSync)(BLOCK_EXTRACT_DIR);
28
+ const blockDataFileKey = _dotPropImmutable.default.get(fileUploadsData, `data`);
29
+ const BLOCK_DATA_FILE_PATH = _path.default.join(BLOCK_EXTRACT_DIR, _path.default.basename(blockDataFileKey));
30
+ log(`Downloading Block data file: ${blockDataFileKey} at "${BLOCK_DATA_FILE_PATH}"`);
31
+ // Download and save block data file in disk.
32
+ await new Promise((resolve, reject) => {
33
+ _s3Stream.s3Stream.readStream(blockDataFileKey).on("error", reject).pipe((0, _fsExtra.createWriteStream)(BLOCK_DATA_FILE_PATH)).on("error", reject).on("finish", resolve);
34
+ });
35
+
36
+ // Load the block data file from disk.
37
+ log(`Load file ${blockDataFileKey}`);
38
+ const {
39
+ block,
40
+ files
41
+ } = await (0, _loadJsonFile.default)(BLOCK_DATA_FILE_PATH);
42
+
43
+ // Only update block data if there are files.
44
+ if (files && Array.isArray(files) && files.length > 0) {
45
+ // Upload block assets.
46
+ const fileIdToNewFileMap = await (0, _uploadAssets.uploadAssets)({
47
+ context,
48
+ files,
49
+ fileUploadsData
50
+ });
51
+ console.log("After uploadAssets:fileIdToNewFileMap", JSON.stringify(Object.fromEntries(fileIdToNewFileMap)));
52
+ const settings = await context.fileManager.settings.getSettings();
53
+ const {
54
+ srcPrefix = ""
55
+ } = settings || {};
56
+ (0, _updateFilesInData.updateFilesInData)({
57
+ data: block.content || {},
58
+ fileIdToNewFileMap,
59
+ srcPrefix
60
+ });
61
+ block.preview = updateBlockPreviewImage({
62
+ file: block.preview || {},
63
+ fileIdToNewFileMap,
64
+ srcPrefix
65
+ });
66
+ }
67
+ log("Removing Directory for block...");
68
+ await (0, _downloadInstallFiles.deleteFile)(blockKey);
69
+ log(`Remove block contents from S3...`);
70
+ await (0, _deleteS3Folder.deleteS3Folder)(_path.default.dirname(fileUploadsData.data));
71
+ console.log("block", JSON.stringify(block, null, 2));
72
+ return block;
73
+ }
74
+ function updateBlockPreviewImage(params) {
75
+ const {
76
+ file: blockPreview,
77
+ fileIdToNewFileMap,
78
+ srcPrefix
79
+ } = params;
80
+ const newFile = fileIdToNewFileMap.get(blockPreview.id || "");
81
+ console.log("updateBlockPreviewImage", blockPreview.id, newFile);
82
+ if (!newFile) {
83
+ console.log("Block preview file not found!");
84
+ return blockPreview;
85
+ }
86
+ const srcPrefixWithoutTrailingSlash = srcPrefix.endsWith("/") ? srcPrefix.slice(0, -1) : srcPrefix;
87
+ blockPreview.src = `${srcPrefixWithoutTrailingSlash}/${newFile.key}`;
88
+ return blockPreview;
89
+ }
@@ -0,0 +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.settings.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":"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"}
@@ -4,11 +4,17 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.blocksHandler = void 0;
7
+
7
8
  var _types = require("../../types");
9
+
8
10
  var _utils = require("../utils");
11
+
9
12
  var _client = require("../../client");
13
+
10
14
  var _mockSecurity = require("../../mockSecurity");
15
+
11
16
  var _utils2 = require("@webiny/utils");
17
+
12
18
  const blocksHandler = async (configuration, payload, context) => {
13
19
  const log = console.log;
14
20
  let subTask;
@@ -23,22 +29,22 @@ const blocksHandler = async (configuration, payload, context) => {
23
29
  subTaskIndex,
24
30
  type,
25
31
  identity
26
- } = payload;
27
- // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
32
+ } = payload; // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
28
33
  // and this Lambda is invoked internally, without credentials.
34
+
29
35
  (0, _mockSecurity.mockSecurity)(identity, context);
36
+
30
37
  try {
31
38
  /*
32
39
  * Note: We're not going to DB for getting next sub-task to process,
33
40
  * because the data might be out of sync due to GSI eventual consistency.
34
41
  */
35
-
36
42
  subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
37
-
38
43
  /**
39
44
  * Base condition!!
40
45
  * Bail out early, if task not found or task's status is not "pending".
41
46
  */
47
+
42
48
  if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
43
49
  noPendingTask = true;
44
50
  return {
@@ -48,6 +54,7 @@ const blocksHandler = async (configuration, payload, context) => {
48
54
  } else {
49
55
  noPendingTask = false;
50
56
  }
57
+
51
58
  prevStatusOfSubTask = subTask.status;
52
59
  log(`Fetched sub task => ${subTask.id}`);
53
60
  console.log("subTask", subTask);
@@ -60,36 +67,32 @@ const blocksHandler = async (configuration, payload, context) => {
60
67
  const {
61
68
  fileUploadsData
62
69
  } = input;
63
- log(`Processing block key "${blockKey}"`);
70
+ log(`Processing block key "${blockKey}"`); // Mark task status as PROCESSING
64
71
 
65
- // Mark task status as PROCESSING
66
72
  subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
67
73
  status: _types.ImportExportTaskStatus.PROCESSING
68
- });
69
- // Update stats in main task
74
+ }); // Update stats in main task
75
+
70
76
  await pageBuilder.importExportTask.updateStats(taskId, {
71
77
  prevStatus: prevStatusOfSubTask,
72
78
  nextStatus: _types.ImportExportTaskStatus.PROCESSING
73
79
  });
74
- prevStatusOfSubTask = subTask.status;
80
+ prevStatusOfSubTask = subTask.status; // Real job
75
81
 
76
- // Real job
77
82
  const block = await (0, _utils.importBlock)({
78
83
  context,
79
84
  blockKey,
80
85
  key: zipFileKey,
81
86
  fileUploadsData
82
- });
87
+ }); // Create a block
83
88
 
84
- // Create a block
85
89
  const pbBlock = await context.pageBuilder.createPageBlock({
86
90
  name: block.name,
87
91
  blockCategory: category,
88
92
  content: block.content,
89
93
  preview: block.preview
90
- });
94
+ }); // Update task record in DB
91
95
 
92
- // Update task record in DB
93
96
  subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
94
97
  status: _types.ImportExportTaskStatus.COMPLETED,
95
98
  data: {
@@ -99,8 +102,8 @@ const blocksHandler = async (configuration, payload, context) => {
99
102
  name: pbBlock.name
100
103
  }
101
104
  }
102
- });
103
- // Update stats in main task
105
+ }); // Update stats in main task
106
+
104
107
  await pageBuilder.importExportTask.updateStats(taskId, {
105
108
  prevStatus: prevStatusOfSubTask,
106
109
  nextStatus: _types.ImportExportTaskStatus.COMPLETED
@@ -108,6 +111,7 @@ const blocksHandler = async (configuration, payload, context) => {
108
111
  prevStatusOfSubTask = subTask.status;
109
112
  } catch (e) {
110
113
  log("[IMPORT_BLOCKS_PROCESS] Error => ", e.message);
114
+
111
115
  if (subTask && subTask.id) {
112
116
  /**
113
117
  * In case of error, we'll update the task status to "failed",
@@ -120,15 +124,15 @@ const blocksHandler = async (configuration, payload, context) => {
120
124
  message: e.message,
121
125
  code: "IMPORT_FAILED"
122
126
  }
123
- });
127
+ }); // Update stats in main task
124
128
 
125
- // Update stats in main task
126
129
  await pageBuilder.importExportTask.updateStats(taskId, {
127
130
  prevStatus: prevStatusOfSubTask,
128
131
  nextStatus: _types.ImportExportTaskStatus.FAILED
129
132
  });
130
133
  prevStatusOfSubTask = subTask.status;
131
134
  }
135
+
132
136
  return {
133
137
  data: null,
134
138
  error: {
@@ -146,8 +150,8 @@ const blocksHandler = async (configuration, payload, context) => {
146
150
  }
147
151
  });
148
152
  } else {
149
- log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
150
- // We want to continue with Self invocation no matter if current block error out.
153
+ log(`Invoking PROCESS for task "${subTaskIndex + 1}"`); // We want to continue with Self invocation no matter if current block error out.
154
+
151
155
  await (0, _client.invokeHandlerClient)({
152
156
  context,
153
157
  name: configuration.handlers.process,
@@ -161,9 +165,11 @@ const blocksHandler = async (configuration, payload, context) => {
161
165
  });
162
166
  }
163
167
  }
168
+
164
169
  return {
165
170
  data: "",
166
171
  error: null
167
172
  };
168
173
  };
174
+
169
175
  exports.blocksHandler = blocksHandler;