@webiny/api-page-builder-import-export 0.0.0-unstable.c2780f51fe → 0.0.0-unstable.c7dec08bb0

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 (35) hide show
  1. package/export/combine/index.js +20 -18
  2. package/export/combine/index.js.map +1 -1
  3. package/export/process/index.js +20 -18
  4. package/export/process/index.js.map +1 -1
  5. package/export/utils.js +9 -3
  6. package/export/utils.js.map +1 -1
  7. package/graphql/crud/blocks.crud.js +8 -4
  8. package/graphql/crud/blocks.crud.js.map +1 -1
  9. package/graphql/crud/forms.crud.js +14 -9
  10. package/graphql/crud/forms.crud.js.map +1 -1
  11. package/graphql/crud/importExportTasks.crud.js +38 -34
  12. package/graphql/crud/importExportTasks.crud.js.map +1 -1
  13. package/graphql/crud/pages.crud.js +8 -4
  14. package/graphql/crud/pages.crud.js.map +1 -1
  15. package/graphql/crud/templates.crud.js +8 -4
  16. package/graphql/crud/templates.crud.js.map +1 -1
  17. package/graphql/graphql/utils/resolve.d.ts +1 -1
  18. package/import/create/index.js +20 -18
  19. package/import/create/index.js.map +1 -1
  20. package/import/process/index.js +20 -18
  21. package/import/process/index.js.map +1 -1
  22. package/import/utils/uploadAssets.js +2 -4
  23. package/import/utils/uploadAssets.js.map +1 -1
  24. package/mockSecurity.js +0 -1
  25. package/mockSecurity.js.map +1 -1
  26. package/package.json +32 -36
  27. package/import/process/blocksHandler.d.ts +0 -3
  28. package/import/process/blocksHandler.js +0 -175
  29. package/import/process/blocksHandler.js.map +0 -1
  30. package/import/process/pagesHandler.d.ts +0 -3
  31. package/import/process/pagesHandler.js +0 -180
  32. package/import/process/pagesHandler.js.map +0 -1
  33. package/import/utils.d.ts +0 -49
  34. package/import/utils.js +0 -641
  35. package/import/utils.js.map +0 -1
@@ -14,24 +14,26 @@ var _default = configuration => {
14
14
  payload,
15
15
  context
16
16
  }) => {
17
- switch (payload.type) {
18
- case "block":
19
- {
20
- return await (0, _blocksHandler.blocksHandler)(configuration, payload, context);
21
- }
22
- case "form":
23
- {
24
- return await (0, _formsHandler.formsHandler)(configuration, payload, context);
25
- }
26
- case "template":
27
- {
28
- return await (0, _templatesHandler.templatesHandler)(configuration, payload, context);
29
- }
30
- default:
31
- {
32
- return await (0, _pagesHandler.pagesHandler)(configuration, payload, context);
33
- }
34
- }
17
+ return context.security.withoutAuthorization(() => {
18
+ switch (payload.type) {
19
+ case "block":
20
+ {
21
+ return (0, _blocksHandler.blocksHandler)(configuration, payload, context);
22
+ }
23
+ case "form":
24
+ {
25
+ return (0, _formsHandler.formsHandler)(configuration, payload, context);
26
+ }
27
+ case "template":
28
+ {
29
+ return (0, _templatesHandler.templatesHandler)(configuration, payload, context);
30
+ }
31
+ default:
32
+ {
33
+ return (0, _pagesHandler.pagesHandler)(configuration, payload, context);
34
+ }
35
+ }
36
+ });
35
37
  });
36
38
  };
37
39
  exports.default = _default;
@@ -1 +1 @@
1
- {"version":3,"names":["configuration","createRawEventHandler","payload","context","type","blocksHandler","formsHandler","templatesHandler","pagesHandler"],"sources":["index.ts"],"sourcesContent":["import { PbImportExportContext } from \"~/types\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/import/process/blocks/blocksHandler\";\nimport { formsHandler } from \"~/import/process/forms/formsHandler\";\nimport { pagesHandler } from \"~/import/process/pages/pagesHandler\";\nimport { templatesHandler } from \"~/import/process/templates/templatesHandler\";\n\nexport interface Configuration {\n handlers: {\n process: string;\n };\n}\n\nexport interface Payload {\n taskId: string;\n subTaskIndex: number;\n type: string;\n identity: SecurityIdentity;\n meta?: Record<string, any>;\n}\n\nexport interface Response {\n data: string | null;\n error: Partial<Error> | null;\n}\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;AAA+E,eAqB/DA,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"}
1
+ {"version":3,"names":["configuration","createRawEventHandler","payload","context","security","withoutAuthorization","type","blocksHandler","formsHandler","templatesHandler","pagesHandler"],"sources":["index.ts"],"sourcesContent":["import { PbImportExportContext } from \"~/types\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/import/process/blocks/blocksHandler\";\nimport { formsHandler } from \"~/import/process/forms/formsHandler\";\nimport { pagesHandler } from \"~/import/process/pages/pagesHandler\";\nimport { templatesHandler } from \"~/import/process/templates/templatesHandler\";\n\nexport interface Configuration {\n handlers: {\n process: string;\n };\n}\n\nexport interface Payload {\n taskId: string;\n subTaskIndex: number;\n type: string;\n identity: SecurityIdentity;\n meta?: Record<string, any>;\n}\n\nexport interface Response {\n data: string | null;\n error: Partial<Error> | null;\n}\n\nexport default (configuration: Configuration) => {\n return createRawEventHandler<Payload, PbImportExportContext, Response>(\n async ({ payload, context }) => {\n return context.security.withoutAuthorization(() => {\n switch (payload.type) {\n case \"block\": {\n return blocksHandler(configuration, payload, context);\n }\n case \"form\": {\n return formsHandler(configuration, payload, context);\n }\n case \"template\": {\n return templatesHandler(configuration, payload, context);\n }\n default: {\n return pagesHandler(configuration, payload, context);\n }\n }\n });\n }\n );\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AAA+E,eAqB/DA,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,OAAOA,OAAO,CAACC,QAAQ,CAACC,oBAAoB,CAAC,MAAM;MAC/C,QAAQH,OAAO,CAACI,IAAI;QAChB,KAAK,OAAO;UAAE;YACV,OAAO,IAAAC,4BAAa,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACzD;QACA,KAAK,MAAM;UAAE;YACT,OAAO,IAAAK,0BAAY,EAACR,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACxD;QACA,KAAK,UAAU;UAAE;YACb,OAAO,IAAAM,kCAAgB,EAACT,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UAC5D;QACA;UAAS;YACL,OAAO,IAAAO,0BAAY,EAACV,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACxD;MAAC;IAET,CAAC,CAAC;EACN,CAAC,CACJ;AACL,CAAC;AAAA"}
@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.uploadAssets = void 0;
8
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
- var _mdbid = _interopRequireDefault(require("mdbid"));
9
+ var _utils = require("@webiny/utils");
10
10
  var _uploadFilesFromS = require("./uploadFilesFromS3");
11
- // @ts-ignore
12
-
13
11
  const uploadAssets = async params => {
14
12
  const {
15
13
  context,
@@ -33,7 +31,7 @@ const uploadAssets = async params => {
33
31
  // Array of file inputs, to insert into the DB.
34
32
  const createFilesInput = [];
35
33
  for (const oldFile of files) {
36
- const id = (0, _mdbid.default)();
34
+ const id = (0, _utils.mdbid)();
37
35
  // We replace the old file ID with a new one.
38
36
  const newKey = `${id}/${oldFile.key.replace(`${oldFile.id}/`, "")}`;
39
37
  const newFile = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldFile), {}, {
@@ -1 +1 @@
1
- {"version":3,"names":["uploadAssets","params","context","files","fileUploadsData","oldIdToNewFileMap","Map","process","env","NODE_ENV","uploadFileMap","createFilesInput","oldFile","id","mdbid","newKey","key","replace","newFile","push","set","assets","uploadFilesFromS3","fileManager","createFilesInBatch"],"sources":["uploadAssets.ts"],"sourcesContent":["// @ts-ignore\nimport mdbid from \"mdbid\";\nimport { PbImportExportContext } from \"~/graphql/types\";\nimport { File, FileInput } from \"@webiny/api-file-manager/types\";\nimport { UploadFileMap, uploadFilesFromS3 } from \"~/import/utils/uploadFilesFromS3\";\nimport { FileUploadsData } from \"~/types\";\n\ninterface UploadAssetsParams {\n context: PbImportExportContext;\n files: File[];\n fileUploadsData: FileUploadsData;\n}\n\nexport const uploadAssets = async (params: UploadAssetsParams) => {\n const { context, files, fileUploadsData } = params;\n\n const oldIdToNewFileMap = new Map<string, FileInput>();\n\n /**\n * This function contains logic of file download from S3.\n * Current we're not mocking zip file download from S3 in tests at the moment.\n * So, we're manually mocking it in case of test just by returning an empty object.\n */\n if (process.env.NODE_ENV === \"test\") {\n return oldIdToNewFileMap;\n }\n\n // A map of temporary file keys (created during ZIP upload) to permanent file keys.\n const uploadFileMap: UploadFileMap = new Map();\n\n // Array of file inputs, to insert into the DB.\n const createFilesInput: FileInput[] = [];\n\n for (const oldFile of files) {\n const id = mdbid();\n // We replace the old file ID with a new one.\n const newKey = `${id}/${oldFile.key.replace(`${oldFile.id}/`, \"\")}`;\n const newFile: FileInput = { ...oldFile, id, key: newKey };\n\n createFilesInput.push(newFile);\n oldIdToNewFileMap.set(oldFile.id, newFile);\n uploadFileMap.set(fileUploadsData.assets[oldFile.key], newFile);\n }\n\n await uploadFilesFromS3(uploadFileMap);\n\n await context.fileManager.createFilesInBatch(createFilesInput);\n\n return oldIdToNewFileMap;\n};\n"],"mappings":";;;;;;;;AACA;AAGA;AAJA;;AAaO,MAAMA,YAAY,GAAG,MAAOC,MAA0B,IAAK;EAC9D,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC;EAAgB,CAAC,GAAGH,MAAM;EAElD,MAAMI,iBAAiB,GAAG,IAAIC,GAAG,EAAqB;;EAEtD;AACJ;AACA;AACA;AACA;EACI,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,MAAM,EAAE;IACjC,OAAOJ,iBAAiB;EAC5B;;EAEA;EACA,MAAMK,aAA4B,GAAG,IAAIJ,GAAG,EAAE;;EAE9C;EACA,MAAMK,gBAA6B,GAAG,EAAE;EAExC,KAAK,MAAMC,OAAO,IAAIT,KAAK,EAAE;IACzB,MAAMU,EAAE,GAAG,IAAAC,cAAK,GAAE;IAClB;IACA,MAAMC,MAAM,GAAI,GAAEF,EAAG,IAAGD,OAAO,CAACI,GAAG,CAACC,OAAO,CAAE,GAAEL,OAAO,CAACC,EAAG,GAAE,EAAE,EAAE,CAAE,EAAC;IACnE,MAAMK,OAAkB,+DAAQN,OAAO;MAAEC,EAAE;MAAEG,GAAG,EAAED;IAAM,EAAE;IAE1DJ,gBAAgB,CAACQ,IAAI,CAACD,OAAO,CAAC;IAC9Bb,iBAAiB,CAACe,GAAG,CAACR,OAAO,CAACC,EAAE,EAAEK,OAAO,CAAC;IAC1CR,aAAa,CAACU,GAAG,CAAChB,eAAe,CAACiB,MAAM,CAACT,OAAO,CAACI,GAAG,CAAC,EAAEE,OAAO,CAAC;EACnE;EAEA,MAAM,IAAAI,mCAAiB,EAACZ,aAAa,CAAC;EAEtC,MAAMR,OAAO,CAACqB,WAAW,CAACC,kBAAkB,CAACb,gBAAgB,CAAC;EAE9D,OAAON,iBAAiB;AAC5B,CAAC;AAAC"}
1
+ {"version":3,"names":["uploadAssets","params","context","files","fileUploadsData","oldIdToNewFileMap","Map","process","env","NODE_ENV","uploadFileMap","createFilesInput","oldFile","id","mdbid","newKey","key","replace","newFile","push","set","assets","uploadFilesFromS3","fileManager","createFilesInBatch"],"sources":["uploadAssets.ts"],"sourcesContent":["import { mdbid } from \"@webiny/utils\";\nimport { PbImportExportContext } from \"~/graphql/types\";\nimport { File, FileInput } from \"@webiny/api-file-manager/types\";\nimport { UploadFileMap, uploadFilesFromS3 } from \"~/import/utils/uploadFilesFromS3\";\nimport { FileUploadsData } from \"~/types\";\n\ninterface UploadAssetsParams {\n context: PbImportExportContext;\n files: File[];\n fileUploadsData: FileUploadsData;\n}\n\nexport const uploadAssets = async (params: UploadAssetsParams) => {\n const { context, files, fileUploadsData } = params;\n\n const oldIdToNewFileMap = new Map<string, FileInput>();\n\n /**\n * This function contains logic of file download from S3.\n * Current we're not mocking zip file download from S3 in tests at the moment.\n * So, we're manually mocking it in case of test just by returning an empty object.\n */\n if (process.env.NODE_ENV === \"test\") {\n return oldIdToNewFileMap;\n }\n\n // A map of temporary file keys (created during ZIP upload) to permanent file keys.\n const uploadFileMap: UploadFileMap = new Map();\n\n // Array of file inputs, to insert into the DB.\n const createFilesInput: FileInput[] = [];\n\n for (const oldFile of files) {\n const id = mdbid();\n // We replace the old file ID with a new one.\n const newKey = `${id}/${oldFile.key.replace(`${oldFile.id}/`, \"\")}`;\n const newFile: FileInput = { ...oldFile, id, key: newKey };\n\n createFilesInput.push(newFile);\n oldIdToNewFileMap.set(oldFile.id, newFile);\n uploadFileMap.set(fileUploadsData.assets[oldFile.key], newFile);\n }\n\n await uploadFilesFromS3(uploadFileMap);\n\n await context.fileManager.createFilesInBatch(createFilesInput);\n\n return oldIdToNewFileMap;\n};\n"],"mappings":";;;;;;;;AAAA;AAGA;AASO,MAAMA,YAAY,GAAG,MAAOC,MAA0B,IAAK;EAC9D,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC;EAAgB,CAAC,GAAGH,MAAM;EAElD,MAAMI,iBAAiB,GAAG,IAAIC,GAAG,EAAqB;;EAEtD;AACJ;AACA;AACA;AACA;EACI,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,MAAM,EAAE;IACjC,OAAOJ,iBAAiB;EAC5B;;EAEA;EACA,MAAMK,aAA4B,GAAG,IAAIJ,GAAG,EAAE;;EAE9C;EACA,MAAMK,gBAA6B,GAAG,EAAE;EAExC,KAAK,MAAMC,OAAO,IAAIT,KAAK,EAAE;IACzB,MAAMU,EAAE,GAAG,IAAAC,YAAK,GAAE;IAClB;IACA,MAAMC,MAAM,GAAI,GAAEF,EAAG,IAAGD,OAAO,CAACI,GAAG,CAACC,OAAO,CAAE,GAAEL,OAAO,CAACC,EAAG,GAAE,EAAE,EAAE,CAAE,EAAC;IACnE,MAAMK,OAAkB,+DAAQN,OAAO;MAAEC,EAAE;MAAEG,GAAG,EAAED;IAAM,EAAE;IAE1DJ,gBAAgB,CAACQ,IAAI,CAACD,OAAO,CAAC;IAC9Bb,iBAAiB,CAACe,GAAG,CAACR,OAAO,CAACC,EAAE,EAAEK,OAAO,CAAC;IAC1CR,aAAa,CAACU,GAAG,CAAChB,eAAe,CAACiB,MAAM,CAACT,OAAO,CAACI,GAAG,CAAC,EAAEE,OAAO,CAAC;EACnE;EAEA,MAAM,IAAAI,mCAAiB,EAACZ,aAAa,CAAC;EAEtC,MAAMR,OAAO,CAACqB,WAAW,CAACC,kBAAkB,CAACb,gBAAgB,CAAC;EAE9D,OAAON,iBAAiB;AAC5B,CAAC;AAAC"}
package/mockSecurity.js CHANGED
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.mockSecurity = void 0;
7
7
  const mockSecurity = (identity, context) => {
8
- context.security.disableAuthorization();
9
8
  context.security.setIdentity(identity);
10
9
  };
11
10
  exports.mockSecurity = mockSecurity;
@@ -1 +1 @@
1
- {"version":3,"names":["mockSecurity","identity","context","security","disableAuthorization","setIdentity"],"sources":["mockSecurity.ts"],"sourcesContent":["import { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\n\nexport const mockSecurity = (identity: SecurityIdentity, context: SecurityContext) => {\n context.security.disableAuthorization();\n context.security.setIdentity(identity);\n};\n"],"mappings":";;;;;;AAEO,MAAMA,YAAY,GAAG,CAACC,QAA0B,EAAEC,OAAwB,KAAK;EAClFA,OAAO,CAACC,QAAQ,CAACC,oBAAoB,EAAE;EACvCF,OAAO,CAACC,QAAQ,CAACE,WAAW,CAACJ,QAAQ,CAAC;AAC1C,CAAC;AAAC"}
1
+ {"version":3,"names":["mockSecurity","identity","context","security","setIdentity"],"sources":["mockSecurity.ts"],"sourcesContent":["import { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\n\nexport const mockSecurity = (identity: SecurityIdentity, context: SecurityContext) => {\n context.security.setIdentity(identity);\n};\n"],"mappings":";;;;;;AAEO,MAAMA,YAAY,GAAG,CAACC,QAA0B,EAAEC,OAAwB,KAAK;EAClFA,OAAO,CAACC,QAAQ,CAACC,WAAW,CAACH,QAAQ,CAAC;AAC1C,CAAC;AAAC"}
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.c2780f51fe",
3
+ "version": "0.0.0-unstable.c7dec08bb0",
4
4
  "main": "index.js",
5
5
  "keywords": [
6
6
  "pbie:base"
@@ -16,52 +16,48 @@
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.c2780f51fe",
20
- "@webiny/api-file-manager": "0.0.0-unstable.c2780f51fe",
21
- "@webiny/api-form-builder": "0.0.0-unstable.c2780f51fe",
22
- "@webiny/api-page-builder": "0.0.0-unstable.c2780f51fe",
23
- "@webiny/api-security": "0.0.0-unstable.c2780f51fe",
24
- "@webiny/error": "0.0.0-unstable.c2780f51fe",
25
- "@webiny/handler": "0.0.0-unstable.c2780f51fe",
26
- "@webiny/handler-aws": "0.0.0-unstable.c2780f51fe",
27
- "@webiny/handler-graphql": "0.0.0-unstable.c2780f51fe",
28
- "@webiny/utils": "0.0.0-unstable.c2780f51fe",
29
- "@webiny/validation": "0.0.0-unstable.c2780f51fe",
19
+ "@webiny/api": "0.0.0-unstable.c7dec08bb0",
20
+ "@webiny/api-file-manager": "0.0.0-unstable.c7dec08bb0",
21
+ "@webiny/api-form-builder": "0.0.0-unstable.c7dec08bb0",
22
+ "@webiny/api-page-builder": "0.0.0-unstable.c7dec08bb0",
23
+ "@webiny/api-security": "0.0.0-unstable.c7dec08bb0",
24
+ "@webiny/error": "0.0.0-unstable.c7dec08bb0",
25
+ "@webiny/handler": "0.0.0-unstable.c7dec08bb0",
26
+ "@webiny/handler-aws": "0.0.0-unstable.c7dec08bb0",
27
+ "@webiny/handler-graphql": "0.0.0-unstable.c7dec08bb0",
28
+ "@webiny/utils": "0.0.0-unstable.c7dec08bb0",
29
+ "@webiny/validation": "0.0.0-unstable.c7dec08bb0",
30
30
  "archiver": "5.3.1",
31
31
  "commodo-fields-object": "1.0.6",
32
32
  "dot-prop-immutable": "2.1.1",
33
33
  "fs-extra": "9.1.0",
34
34
  "load-json-file": "6.2.0",
35
35
  "lodash": "4.17.21",
36
- "mdbid": "1.0.0",
37
36
  "node-fetch": "2.6.9",
38
37
  "stream": "0.0.2",
39
38
  "uniqid": "5.4.0",
40
39
  "yauzl": "2.10.0"
41
40
  },
42
41
  "devDependencies": {
43
- "@babel/cli": "^7.19.3",
44
- "@babel/core": "^7.19.3",
45
- "@babel/plugin-proposal-export-default-from": "^7.16.0",
46
- "@babel/preset-env": "^7.19.4",
47
- "@babel/preset-typescript": "^7.18.6",
48
- "@types/archiver": "^5.3.1",
49
- "@types/node-fetch": "^2.6.1",
50
- "@types/yauzl": "^2.9.2",
51
- "@webiny/api-dynamodb-to-elasticsearch": "^0.0.0-unstable.c2780f51fe",
52
- "@webiny/api-file-manager-ddb-es": "^0.0.0-unstable.c2780f51fe",
53
- "@webiny/api-i18n-ddb": "^0.0.0-unstable.c2780f51fe",
54
- "@webiny/api-security-so-ddb": "^0.0.0-unstable.c2780f51fe",
55
- "@webiny/api-tenancy": "^0.0.0-unstable.c2780f51fe",
56
- "@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.c2780f51fe",
57
- "@webiny/api-wcp": "^0.0.0-unstable.c2780f51fe",
58
- "@webiny/cli": "^0.0.0-unstable.c2780f51fe",
59
- "@webiny/db": "^0.0.0-unstable.c2780f51fe",
60
- "@webiny/project-utils": "^0.0.0-unstable.c2780f51fe",
61
- "jest": "^28.1.0",
62
- "jest-dynalite": "^3.2.0",
63
- "rimraf": "^3.0.2",
64
- "ttypescript": "^1.5.12",
42
+ "@babel/cli": "7.20.7",
43
+ "@babel/core": "7.20.12",
44
+ "@babel/plugin-proposal-export-default-from": "7.18.10",
45
+ "@babel/preset-env": "7.20.2",
46
+ "@babel/preset-typescript": "7.18.6",
47
+ "@types/archiver": "5.3.1",
48
+ "@types/node-fetch": "2.6.2",
49
+ "@types/yauzl": "2.10.0",
50
+ "@webiny/api-authentication": "0.0.0-unstable.c7dec08bb0",
51
+ "@webiny/api-dynamodb-to-elasticsearch": "0.0.0-unstable.c7dec08bb0",
52
+ "@webiny/api-tenancy": "0.0.0-unstable.c7dec08bb0",
53
+ "@webiny/api-wcp": "0.0.0-unstable.c7dec08bb0",
54
+ "@webiny/cli": "0.0.0-unstable.c7dec08bb0",
55
+ "@webiny/db": "0.0.0-unstable.c7dec08bb0",
56
+ "@webiny/project-utils": "0.0.0-unstable.c7dec08bb0",
57
+ "jest": "29.5.0",
58
+ "jest-dynalite": "3.6.1",
59
+ "rimraf": "3.0.2",
60
+ "ttypescript": "1.5.15",
65
61
  "typescript": "4.7.4"
66
62
  },
67
63
  "publishConfig": {
@@ -79,5 +75,5 @@
79
75
  ]
80
76
  }
81
77
  },
82
- "gitHead": "c2780f51fe628e1ef0f6b55c2bce9b74d3470d79"
78
+ "gitHead": "c7dec08bb095467cca6a61381bd399d66b7bb147"
83
79
  }
@@ -1,3 +0,0 @@
1
- import { PbImportExportContext } from "../../types";
2
- import { Configuration, Payload, Response } from ".";
3
- export declare const blocksHandler: (configuration: Configuration, payload: Payload, context: PbImportExportContext) => Promise<Response>;
@@ -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":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAGO,MAAMA,aAAa,GAAG,OACzBC,aADyB,EAEzBC,OAFyB,EAGzBC,OAHyB,KAIL;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAApB;EACA,IAAIE,OAAJ;EACA,IAAIC,aAAa,GAAG,IAApB;EACA,IAAIC,mBAAmB,GAAGC,6BAAA,CAAuBC,OAAjD;EAEAN,GAAG,CAAC,oCAAD,CAAH;EACA,MAAM;IAAEO;EAAF,IAAkBR,OAAxB;EACA,MAAM;IAAES,MAAF;IAAUC,YAAV;IAAwBC,IAAxB;IAA8BC;EAA9B,IAA2Cb,OAAjD,CARoB,CASpB;EACA;;EACA,IAAAc,0BAAA,EAAaD,QAAb,EAAuBZ,OAAvB;;EAEA,IAAI;IACA;AACR;AACA;AACA;IAEQG,OAAO,GAAG,MAAMK,WAAW,CAACM,gBAAZ,CAA6BC,UAA7B,CAAwCN,MAAxC,EAAgD,IAAAO,eAAA,EAAQN,YAAR,EAAsB,CAAtB,CAAhD,CAAhB;IAEA;AACR;AACA;AACA;;IACQ,IAAI,CAACP,OAAD,IAAYA,OAAO,CAACc,MAAR,KAAmBX,6BAAA,CAAuBC,OAA1D,EAAmE;MAC/DH,aAAa,GAAG,IAAhB;MACA,OAAO;QACHc,IAAI,EAAE,EADH;QAEHC,KAAK,EAAE;MAFJ,CAAP;IAIH,CAND,MAMO;MACHf,aAAa,GAAG,KAAhB;IACH;;IACDC,mBAAmB,GAAGF,OAAO,CAACc,MAA9B;IAEAhB,GAAG,CAAE,uBAAsBE,OAAO,CAACiB,EAAG,EAAnC,CAAH;IACAlB,OAAO,CAACD,GAAR,CAAY,SAAZ,EAAuBE,OAAvB;IAEA,MAAM;MAAEkB,QAAF;MAAYC,QAAZ;MAAsBC,UAAtB;MAAkCC;IAAlC,IAA4CrB,OAAO,CAACe,IAA1D;IACA,MAAM;MAAEO;IAAF,IAAsBD,KAA5B;IAEAvB,GAAG,CAAE,yBAAwBoB,QAAS,GAAnC,CAAH,CA7BA,CA+BA;;IACAlB,OAAO,GAAG,MAAMK,WAAW,CAACM,gBAAZ,CAA6BY,aAA7B,CAA2CjB,MAA3C,EAAmDN,OAAO,CAACiB,EAA3D,EAA+D;MAC3EH,MAAM,EAAEX,6BAAA,CAAuBqB;IAD4C,CAA/D,CAAhB,CAhCA,CAmCA;;IACA,MAAMnB,WAAW,CAACM,gBAAZ,CAA6Bc,WAA7B,CAAyCnB,MAAzC,EAAiD;MACnDoB,UAAU,EAAExB,mBADuC;MAEnDyB,UAAU,EAAExB,6BAAA,CAAuBqB;IAFgB,CAAjD,CAAN;IAIAtB,mBAAmB,GAAGF,OAAO,CAACc,MAA9B,CAxCA,CA0CA;;IACA,MAAMc,KAAK,GAAG,MAAM,IAAAC,kBAAA,EAAY;MAC5BhC,OAD4B;MAE5BqB,QAF4B;MAG5BY,GAAG,EAAEV,UAHuB;MAI5BE;IAJ4B,CAAZ,CAApB,CA3CA,CAkDA;;IACA,MAAMS,OAAO,GAAG,MAAMlC,OAAO,CAACQ,WAAR,CAAoB2B,eAApB,CAAoC;MACtDC,IAAI,EAAEL,KAAK,CAACK,IAD0C;MAEtDC,aAAa,EAAEf,QAFuC;MAGtDgB,OAAO,EAAEP,KAAK,CAACO,OAHuC;MAItDC,OAAO,EAAER,KAAK,CAACQ;IAJuC,CAApC,CAAtB,CAnDA,CA0DA;;IACApC,OAAO,GAAG,MAAMK,WAAW,CAACM,gBAAZ,CAA6BY,aAA7B,CAA2CjB,MAA3C,EAAmDN,OAAO,CAACiB,EAA3D,EAA+D;MAC3EH,MAAM,EAAEX,6BAAA,CAAuBkC,SAD4C;MAE3EtB,IAAI,EAAE;QACFuB,OAAO,EAAE,MADP;QAEFV,KAAK,EAAE;UACHX,EAAE,EAAEc,OAAO,CAACd,EADT;UAEHgB,IAAI,EAAEF,OAAO,CAACE;QAFX;MAFL;IAFqE,CAA/D,CAAhB,CA3DA,CAqEA;;IACA,MAAM5B,WAAW,CAACM,gBAAZ,CAA6Bc,WAA7B,CAAyCnB,MAAzC,EAAiD;MACnDoB,UAAU,EAAExB,mBADuC;MAEnDyB,UAAU,EAAExB,6BAAA,CAAuBkC;IAFgB,CAAjD,CAAN;IAIAnC,mBAAmB,GAAGF,OAAO,CAACc,MAA9B;EACH,CA3ED,CA2EE,OAAOyB,CAAP,EAAU;IACRzC,GAAG,CAAC,mCAAD,EAAsCyC,CAAC,CAACD,OAAxC,CAAH;;IAEA,IAAItC,OAAO,IAAIA,OAAO,CAACiB,EAAvB,EAA2B;MACvB;AACZ;AACA;AACA;MACYjB,OAAO,GAAG,MAAMK,WAAW,CAACM,gBAAZ,CAA6BY,aAA7B,CAA2CjB,MAA3C,EAAmDN,OAAO,CAACiB,EAA3D,EAA+D;QAC3EH,MAAM,EAAEX,6BAAA,CAAuBqC,MAD4C;QAE3ExB,KAAK,EAAE;UACHiB,IAAI,EAAEM,CAAC,CAACN,IADL;UAEHK,OAAO,EAAEC,CAAC,CAACD,OAFR;UAGHG,IAAI,EAAE;QAHH;MAFoE,CAA/D,CAAhB,CALuB,CAcvB;;MACA,MAAMpC,WAAW,CAACM,gBAAZ,CAA6Bc,WAA7B,CAAyCnB,MAAzC,EAAiD;QACnDoB,UAAU,EAAExB,mBADuC;QAEnDyB,UAAU,EAAExB,6BAAA,CAAuBqC;MAFgB,CAAjD,CAAN;MAIAtC,mBAAmB,GAAGF,OAAO,CAACc,MAA9B;IACH;;IAED,OAAO;MACHC,IAAI,EAAE,IADH;MAEHC,KAAK,EAAE;QACHsB,OAAO,EAAEC,CAAC,CAACD;MADR;IAFJ,CAAP;EAMH,CA1GD,SA0GU;IACN;IACA,IAAIrC,aAAJ,EAAmB;MACfH,GAAG,CAAE,gCAA+BQ,MAAO,EAAxC,CAAH;MAEA,MAAMD,WAAW,CAACM,gBAAZ,CAA6B+B,UAA7B,CAAwCpC,MAAxC,EAAgD;QAClDQ,MAAM,EAAEX,6BAAA,CAAuBkC,SADmB;QAElDtB,IAAI,EAAE;UACFuB,OAAO,EAAG;QADR;MAF4C,CAAhD,CAAN;IAMH,CATD,MASO;MACHxC,GAAG,CAAE,8BAA6BS,YAAY,GAAG,CAAE,GAAhD,CAAH,CADG,CAEH;;MACA,MAAM,IAAAoC,2BAAA,EAA6B;QAC/B9C,OAD+B;QAE/BoC,IAAI,EAAEtC,aAAa,CAACiD,QAAd,CAAuBC,OAFE;QAG/BjD,OAAO,EAAE;UACLU,MADK;UAELC,YAAY,EAAEA,YAAY,GAAG,CAFxB;UAGLC,IAHK;UAILC,QAAQ,EAAEZ,OAAO,CAACiD,QAAR,CAAiBC,WAAjB;QAJL,CAHsB;QAS/BC,WAAW,EAAE;MATkB,CAA7B,CAAN;IAWH;EACJ;;EACD,OAAO;IACHjC,IAAI,EAAE,EADH;IAEHC,KAAK,EAAE;EAFJ,CAAP;AAIH,CA1JM"}
@@ -1,3 +0,0 @@
1
- import { PbImportExportContext } from "../../types";
2
- import { Configuration, Payload, Response } from ".";
3
- export declare const pagesHandler: (configuration: Configuration, payload: Payload, context: PbImportExportContext) => Promise<Response>;
@@ -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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"}