@webiny/api-page-builder-import-export 5.37.0-beta.0 → 5.37.0-beta.2

package/import/utils/uploadAssets.js

@@ -8,6 +8,16 @@ exports.uploadAssets = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _utils = require("@webiny/utils");
 var _uploadFilesFromS = require("./uploadFilesFromS3");
+function notAPreviouslyImportedFile(importedImages) {
+  return file => {
+    return !importedImages.some(existingImportedImage => existingImportedImage.meta.originalKey === file.key);
+  };
+}
+function notAnExistingFile(existingFiles) {
+  return file => {
+    return !existingFiles.some(existingFile => existingFile.key === file.key);
+  };
+}
 const uploadAssets = async params => {
   const {
     context,
@@ -25,22 +35,50 @@ const uploadAssets = async params => {
     return oldIdToNewFileMap;
   }
 
+  // Check if the requested files were already imported in the past.
+  const [importedImages] = await context.fileManager.listFiles({
+    where: {
+      meta: {
+        originalKey_in: files.map(file => file.key)
+      }
+    }
+  });
+
+  // Link files that were already imported.
+  for (const importedImage of importedImages) {
+    const fileBeingImported = files.find(file => file.key === importedImage.meta.originalKey);
+    if (fileBeingImported) {
+      oldIdToNewFileMap.set(fileBeingImported.id, importedImage);
+    }
+  }
+
+  // Check if files with such IDs already exist.
+  const [existingFiles] = await context.fileManager.listFiles({
+    where: {
+      id_in: files.map(file => file.id)
+    }
+  });
+  const newFilesToImport = files.filter(notAnExistingFile(existingFiles)).filter(notAPreviouslyImportedFile(importedImages));
+
   // A map of temporary file keys (created during ZIP upload) to permanent file keys.
   const uploadFileMap = new Map();
 
   // Array of file inputs, to insert into the DB.
   const createFilesInput = [];
-  for (const oldFile of files) {
+  for (const toImport of newFilesToImport) {
+    // We generate a new file id, key, and add `meta.originalKey` property to prevent duplicates on future imports.
     const id = (0, _utils.mdbid)();
-    // We replace the old file ID with a new one.
-    const newKey = `${id}/${oldFile.key.replace(`${oldFile.id}/`, "")}`;
-    const newFile = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldFile), {}, {
+    const newKey = `${id}/${toImport.key.replace(`${toImport.id}/`, "")}`;
+    const newFile = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toImport), {}, {
       id,
-      key: newKey
+      key: newKey,
+      meta: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toImport.meta), {}, {
+        originalKey: toImport.key
+      })
     });
     createFilesInput.push(newFile);
-    oldIdToNewFileMap.set(oldFile.id, newFile);
-    uploadFileMap.set(fileUploadsData.assets[oldFile.key], newFile);
+    oldIdToNewFileMap.set(toImport.id, newFile);
+    uploadFileMap.set(fileUploadsData.assets[toImport.key], newFile);
   }
   await (0, _uploadFilesFromS.uploadFilesFromS3)(uploadFileMap);
   await context.fileManager.createFilesInBatch(createFilesInput);

package/import/utils/uploadAssets.js.map

@@ -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":["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"}
+{"version":3,"names":["_utils","require","_uploadFilesFromS","notAPreviouslyImportedFile","importedImages","file","some","existingImportedImage","meta","originalKey","key","notAnExistingFile","existingFiles","existingFile","uploadAssets","params","context","files","fileUploadsData","oldIdToNewFileMap","Map","process","env","NODE_ENV","fileManager","listFiles","where","originalKey_in","map","importedImage","fileBeingImported","find","set","id","id_in","newFilesToImport","filter","uploadFileMap","createFilesInput","toImport","mdbid","newKey","replace","newFile","_objectSpread2","default","push","assets","uploadFilesFromS3","createFilesInBatch","exports"],"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\nfunction notAPreviouslyImportedFile(importedImages: File[]) {\n    return (file: File) => {\n        return !importedImages.some(\n            existingImportedImage => existingImportedImage.meta.originalKey === file.key\n        );\n    };\n}\n\nfunction notAnExistingFile(existingFiles: File[]) {\n    return (file: File) => {\n        return !existingFiles.some(existingFile => existingFile.key === file.key);\n    };\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    // Check if the requested files were already imported in the past.\n    const [importedImages] = await context.fileManager.listFiles({\n        where: { meta: { originalKey_in: files.map(file => file.key) } }\n    });\n\n    // Link files that were already imported.\n    for (const importedImage of importedImages) {\n        const fileBeingImported = files.find(file => file.key === importedImage.meta.originalKey);\n\n        if (fileBeingImported) {\n            oldIdToNewFileMap.set(fileBeingImported.id, importedImage);\n        }\n    }\n\n    // Check if files with such IDs already exist.\n    const [existingFiles] = await context.fileManager.listFiles({\n        where: { id_in: files.map(file => file.id) }\n    });\n\n    const newFilesToImport = files\n        .filter(notAnExistingFile(existingFiles))\n        .filter(notAPreviouslyImportedFile(importedImages));\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 toImport of newFilesToImport) {\n        // We generate a new file id, key, and add `meta.originalKey` property to prevent duplicates on future imports.\n        const id = mdbid();\n        const newKey = `${id}/${toImport.key.replace(`${toImport.id}/`, \"\")}`;\n        const newFile: FileInput = {\n            ...toImport,\n            id,\n            key: newKey,\n            meta: { ...toImport.meta, originalKey: toImport.key }\n        };\n\n        createFilesInput.push(newFile);\n        oldIdToNewFileMap.set(toImport.id, newFile);\n        uploadFileMap.set(fileUploadsData.assets[toImport.key], newFile);\n    }\n\n    await uploadFilesFromS3(uploadFileMap);\n\n    await context.fileManager.createFilesInBatch(createFilesInput);\n\n    return oldIdToNewFileMap;\n};\n"],"mappings":"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"}

package/import/utils/uploadFilesFromS3.js.map

@@ -1 +1 @@
-{"version":3,"names":["uploadFilesFromS3","fileMap","promises","source","target","Array","from","entries","readStream","s3Stream","ws","writeStream","key","type","pipe","streamPassThrough","push","streamPassThroughUploadPromise","console","log","Promise","all"],"sources":["uploadFilesFromS3.ts"],"sourcesContent":["import { s3Stream } from \"~/export/s3Stream\";\nimport { FileInput } from \"@webiny/api-file-manager/types\";\n\nexport type UploadFileMap = Map<string, FileInput>;\n\nexport async function uploadFilesFromS3(fileMap: UploadFileMap) {\n    const promises = [];\n    for (const [source, target] of Array.from(fileMap.entries())) {\n        // Read file.\n        const readStream = s3Stream.readStream(source);\n\n        const ws = s3Stream.writeStream(target.key, target.type);\n        readStream.pipe(ws.streamPassThrough);\n        promises.push(ws.streamPassThroughUploadPromise);\n\n        console.log(`Successfully queued file \"${target.key}\"`);\n    }\n\n    return Promise.all(promises);\n}\n"],"mappings":";;;;;;AAAA;AAKO,eAAeA,iBAAiB,CAACC,OAAsB,EAAE;EAC5D,MAAMC,QAAQ,GAAG,EAAE;EACnB,KAAK,MAAM,CAACC,MAAM,EAAEC,MAAM,CAAC,IAAIC,KAAK,CAACC,IAAI,CAACL,OAAO,CAACM,OAAO,EAAE,CAAC,EAAE;IAC1D;IACA,MAAMC,UAAU,GAAGC,kBAAQ,CAACD,UAAU,CAACL,MAAM,CAAC;IAE9C,MAAMO,EAAE,GAAGD,kBAAQ,CAACE,WAAW,CAACP,MAAM,CAACQ,GAAG,EAAER,MAAM,CAACS,IAAI,CAAC;IACxDL,UAAU,CAACM,IAAI,CAACJ,EAAE,CAACK,iBAAiB,CAAC;IACrCb,QAAQ,CAACc,IAAI,CAACN,EAAE,CAACO,8BAA8B,CAAC;IAEhDC,OAAO,CAACC,GAAG,CAAE,6BAA4Bf,MAAM,CAACQ,GAAI,GAAE,CAAC;EAC3D;EAEA,OAAOQ,OAAO,CAACC,GAAG,CAACnB,QAAQ,CAAC;AAChC"}
+{"version":3,"names":["_s3Stream","require","uploadFilesFromS3","fileMap","promises","source","target","Array","from","entries","readStream","s3Stream","ws","writeStream","key","type","pipe","streamPassThrough","push","streamPassThroughUploadPromise","console","log","Promise","all"],"sources":["uploadFilesFromS3.ts"],"sourcesContent":["import { s3Stream } from \"~/export/s3Stream\";\nimport { FileInput } from \"@webiny/api-file-manager/types\";\n\nexport type UploadFileMap = Map<string, FileInput>;\n\nexport async function uploadFilesFromS3(fileMap: UploadFileMap) {\n    const promises = [];\n    for (const [source, target] of Array.from(fileMap.entries())) {\n        // Read file.\n        const readStream = s3Stream.readStream(source);\n\n        const ws = s3Stream.writeStream(target.key, target.type);\n        readStream.pipe(ws.streamPassThrough);\n        promises.push(ws.streamPassThroughUploadPromise);\n\n        console.log(`Successfully queued file \"${target.key}\"`);\n    }\n\n    return Promise.all(promises);\n}\n"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AAKO,eAAeC,iBAAiBA,CAACC,OAAsB,EAAE;EAC5D,MAAMC,QAAQ,GAAG,EAAE;EACnB,KAAK,MAAM,CAACC,MAAM,EAAEC,MAAM,CAAC,IAAIC,KAAK,CAACC,IAAI,CAACL,OAAO,CAACM,OAAO,CAAC,CAAC,CAAC,EAAE;IAC1D;IACA,MAAMC,UAAU,GAAGC,kBAAQ,CAACD,UAAU,CAACL,MAAM,CAAC;IAE9C,MAAMO,EAAE,GAAGD,kBAAQ,CAACE,WAAW,CAACP,MAAM,CAACQ,GAAG,EAAER,MAAM,CAACS,IAAI,CAAC;IACxDL,UAAU,CAACM,IAAI,CAACJ,EAAE,CAACK,iBAAiB,CAAC;IACrCb,QAAQ,CAACc,IAAI,CAACN,EAAE,CAACO,8BAA8B,CAAC;IAEhDC,OAAO,CAACC,GAAG,CAAE,6BAA4Bf,MAAM,CAACQ,GAAI,GAAE,CAAC;EAC3D;EAEA,OAAOQ,OAAO,CAACC,GAAG,CAACnB,QAAQ,CAAC;AAChC"}

package/mockSecurity.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mockSecurity = void 0;
 const mockSecurity = (identity, context) => {
-  context.security.disableAuthorization();
   context.security.setIdentity(identity);
 };
 exports.mockSecurity = mockSecurity;

package/mockSecurity.js.map

@@ -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"}
+{"version":3,"names":["mockSecurity","identity","context","security","setIdentity","exports"],"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,GAAGA,CAACC,QAA0B,EAAEC,OAAwB,KAAK;EAClFA,OAAO,CAACC,QAAQ,CAACC,WAAW,CAACH,QAAQ,CAAC;AAC1C,CAAC;AAACI,OAAA,CAAAL,YAAA,GAAAA,YAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-page-builder-import-export",
-	"version": "5.37.0-beta.0",
+	"version": "5.37.0-beta.2",
 	"main": "index.js",
 	"keywords": [
 		"pbie:base"
@@ -14,19 +14,19 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.20.13",
+		"@babel/runtime": "7.22.6",
 		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api": "5.37.0-beta.0",
-		"@webiny/api-file-manager": "5.37.0-beta.0",
-		"@webiny/api-form-builder": "5.37.0-beta.0",
-		"@webiny/api-page-builder": "5.37.0-beta.0",
-		"@webiny/api-security": "5.37.0-beta.0",
-		"@webiny/error": "5.37.0-beta.0",
-		"@webiny/handler": "5.37.0-beta.0",
-		"@webiny/handler-aws": "5.37.0-beta.0",
-		"@webiny/handler-graphql": "5.37.0-beta.0",
-		"@webiny/utils": "5.37.0-beta.0",
-		"@webiny/validation": "5.37.0-beta.0",
+		"@webiny/api": "5.37.0-beta.2",
+		"@webiny/api-file-manager": "5.37.0-beta.2",
+		"@webiny/api-form-builder": "5.37.0-beta.2",
+		"@webiny/api-page-builder": "5.37.0-beta.2",
+		"@webiny/api-security": "5.37.0-beta.2",
+		"@webiny/error": "5.37.0-beta.2",
+		"@webiny/handler": "5.37.0-beta.2",
+		"@webiny/handler-aws": "5.37.0-beta.2",
+		"@webiny/handler-graphql": "5.37.0-beta.2",
+		"@webiny/utils": "5.37.0-beta.2",
+		"@webiny/validation": "5.37.0-beta.2",
 		"archiver": "5.3.1",
 		"commodo-fields-object": "1.0.6",
 		"dot-prop-immutable": "2.1.1",
@@ -39,25 +39,22 @@
 		"yauzl": "2.10.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "7.20.7",
-		"@babel/core": "7.20.12",
+		"@babel/cli": "7.22.6",
+		"@babel/core": "7.22.8",
 		"@babel/plugin-proposal-export-default-from": "7.18.10",
-		"@babel/preset-env": "7.20.2",
-		"@babel/preset-typescript": "7.18.6",
+		"@babel/preset-env": "7.22.7",
+		"@babel/preset-typescript": "7.22.5",
 		"@types/archiver": "5.3.1",
 		"@types/node-fetch": "2.6.2",
 		"@types/yauzl": "2.10.0",
-		"@webiny/api-dynamodb-to-elasticsearch": "5.37.0-beta.0",
-		"@webiny/api-file-manager-ddb-es": "5.37.0-beta.0",
-		"@webiny/api-i18n-ddb": "5.37.0-beta.0",
-		"@webiny/api-security-so-ddb": "5.37.0-beta.0",
-		"@webiny/api-tenancy": "5.37.0-beta.0",
-		"@webiny/api-tenancy-so-ddb": "5.37.0-beta.0",
-		"@webiny/api-wcp": "5.37.0-beta.0",
-		"@webiny/cli": "5.37.0-beta.0",
-		"@webiny/db": "5.37.0-beta.0",
-		"@webiny/project-utils": "5.37.0-beta.0",
-		"jest": "28.1.3",
+		"@webiny/api-authentication": "5.37.0-beta.2",
+		"@webiny/api-dynamodb-to-elasticsearch": "5.37.0-beta.2",
+		"@webiny/api-tenancy": "5.37.0-beta.2",
+		"@webiny/api-wcp": "5.37.0-beta.2",
+		"@webiny/cli": "5.37.0-beta.2",
+		"@webiny/db": "5.37.0-beta.2",
+		"@webiny/project-utils": "5.37.0-beta.2",
+		"jest": "29.5.0",
 		"jest-dynalite": "3.6.1",
 		"rimraf": "3.0.2",
 		"ttypescript": "1.5.15",
@@ -78,5 +75,5 @@
 			]
 		}
 	},
-	"gitHead": "7bb6232942f0414e22a4549113dd112bb92e52c5"
+	"gitHead": "8d3f4ba102f9f73b0a17455fc401a15aea68ce63"
 }

package/types.js

@@ -21,17 +21,69 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 // Entities.
-let ExportRevisionType;
-exports.ExportRevisionType = ExportRevisionType;
-(function (ExportRevisionType) {
+let ExportRevisionType = /*#__PURE__*/function (ExportRevisionType) {
   ExportRevisionType["PUBLISHED"] = "published";
   ExportRevisionType["LATEST"] = "latest";
-})(ExportRevisionType || (exports.ExportRevisionType = ExportRevisionType = {}));
-let ImportExportTaskStatus;
-exports.ImportExportTaskStatus = ImportExportTaskStatus;
-(function (ImportExportTaskStatus) {
+  return ExportRevisionType;
+}({});
+exports.ExportRevisionType = ExportRevisionType;
+let ImportExportTaskStatus = /*#__PURE__*/function (ImportExportTaskStatus) {
   ImportExportTaskStatus["PENDING"] = "pending";
   ImportExportTaskStatus["PROCESSING"] = "processing";
   ImportExportTaskStatus["COMPLETED"] = "completed";
   ImportExportTaskStatus["FAILED"] = "failed";
-})(ImportExportTaskStatus || (exports.ImportExportTaskStatus = ImportExportTaskStatus = {}));
+  return ImportExportTaskStatus;
+}({});
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+/**
+ * @category StorageOperations
+ * @category ImportExportTaskStorageOperations
+ */
+exports.ImportExportTaskStatus = ImportExportTaskStatus;

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ExportRevisionType","ImportExportTaskStatus"],"sources":["types.ts"],"sourcesContent":["export * from \"./graphql/types\";\n\n// Entities.\nexport enum ExportRevisionType {\n    PUBLISHED = \"published\",\n    LATEST = \"latest\"\n}\n\nexport enum ImportExportTaskStatus {\n    PENDING = \"pending\",\n    PROCESSING = \"processing\",\n    COMPLETED = \"completed\",\n    FAILED = \"failed\"\n}\n\nexport interface ImportExportTaskStats {\n    [ImportExportTaskStatus.PENDING]: number;\n    [ImportExportTaskStatus.PROCESSING]: number;\n    [ImportExportTaskStatus.COMPLETED]: number;\n    [ImportExportTaskStatus.FAILED]: number;\n    total: number;\n}\n\ninterface CreatedBy {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ImportExportTask {\n    id: string;\n    parent: string;\n    status: ImportExportTaskStatus;\n    data: Record<string, any>;\n    stats: ImportExportTaskStats;\n    error: Record<string, any>;\n    input: Record<string, any>;\n    createdOn: string;\n    createdBy: CreatedBy;\n    tenant: string;\n    locale: string;\n}\n\nexport interface File {\n    id: string;\n    src: string;\n}\n\nexport interface MetaResponse {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsGetParams {\n    where: {\n        id: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsListParams {\n    where: {\n        tenant: string;\n        locale: string;\n    };\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport type ImportExportTaskStorageOperationsListResponse = [ImportExportTask[], MetaResponse];\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsCreateParams {\n    input: Record<string, any>;\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateParams {\n    input: Record<string, any>;\n    original: ImportExportTask;\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsDeleteParams {\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsGetSubTaskParams {\n    where: {\n        id: string;\n        parent: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsListSubTaskParams {\n    where: {\n        tenant: string;\n        locale: string;\n        parent: string;\n        status: ImportExportTaskStatus;\n        createdBy?: string;\n    };\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport type ImportExportTaskStorageOperationsListSubTaskResponse = [\n    ImportExportTask[],\n    MetaResponse\n];\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsCreateSubTaskParams {\n    input: Record<string, any>;\n    subTask: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateSubTaskParams {\n    input: Record<string, any>;\n    original: ImportExportTask;\n    subTask: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateTaskStatsParams {\n    input: {\n        prevStatus: ImportExportTaskStatus;\n        nextStatus: ImportExportTaskStatus;\n    };\n    original: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperations {\n    /**\n     * Get a single  import export task item by given params.\n     */\n    getTask(params: ImportExportTaskStorageOperationsGetParams): Promise<ImportExportTask | null>;\n\n    /**\n     * Get all  import export tasks by given params.\n     */\n    listTasks(\n        params: ImportExportTaskStorageOperationsListParams\n    ): Promise<ImportExportTaskStorageOperationsListResponse>;\n\n    createTask(params: ImportExportTaskStorageOperationsCreateParams): Promise<ImportExportTask>;\n\n    updateTask(params: ImportExportTaskStorageOperationsUpdateParams): Promise<ImportExportTask>;\n\n    deleteTask(params: ImportExportTaskStorageOperationsDeleteParams): Promise<ImportExportTask>;\n\n    updateTaskStats(\n        params: ImportExportTaskStorageOperationsUpdateTaskStatsParams\n    ): Promise<ImportExportTask>;\n\n    /**\n     * Get a single  import export sub-task item by given params.\n     */\n    getSubTask(\n        params: ImportExportTaskStorageOperationsGetSubTaskParams\n    ): Promise<ImportExportTask | null>;\n\n    /**\n     * Get all  import export sub-tasks by given params.\n     */\n    listSubTasks(\n        params: ImportExportTaskStorageOperationsListSubTaskParams\n    ): Promise<ImportExportTaskStorageOperationsListSubTaskResponse>;\n\n    createSubTask(\n        params: ImportExportTaskStorageOperationsCreateSubTaskParams\n    ): Promise<ImportExportTask>;\n\n    updateSubTask(\n        params: ImportExportTaskStorageOperationsUpdateSubTaskParams\n    ): Promise<ImportExportTask>;\n}\n\nexport interface FileUploadsData {\n    /**\n     * Location of export data file. Export data contains the relevant entity data (block, page, template), and an\n     * array of file objects, exported from the DB, that need to be imported.\n     *\n     * Example:\n     * 'IMPORTS/8lf6y7xp5/8lf6x9v68-header-1/8lf6x9v69-header-1/Header #1.json'\n     */\n    data: string;\n    /**\n     * Example:\n     * '8ldspraka-9l9iaffak-1.jpeg': 'IMPORTS/8lf6y7xp5/8lf6x9v68-header-1/assets/8ldspraka-9l9iaffak-1.jpeg',\n     * '8ldwyq8ao-pb-editor-page-element-rzfKWtdTWN.png': 'IMPORTS/8lf6y7xp5/8lf6x9v69-header-1/assets/8ldwyq8ao-pb-editor-page-element-rzfKWtdTWN.png'\n     */\n    assets: Record<string, string>;\n}\n\nexport interface ImportData {\n    assets: Record<string, string>;\n    data: string;\n    key: string;\n}\n"],"mappings":";;;;;;;;;;AAAA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAEA;AAAA,IACYA,kBAAkB;AAAA;AAAA,WAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;AAAA,GAAlBA,kBAAkB,kCAAlBA,kBAAkB;AAAA,IAKlBC,sBAAsB;AAAA;AAAA,WAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;AAAA,GAAtBA,sBAAsB,sCAAtBA,sBAAsB"}
+{"version":3,"names":["_types","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","ExportRevisionType","ImportExportTaskStatus"],"sources":["types.ts"],"sourcesContent":["export * from \"./graphql/types\";\n\n// Entities.\nexport enum ExportRevisionType {\n    PUBLISHED = \"published\",\n    LATEST = \"latest\"\n}\n\nexport enum ImportExportTaskStatus {\n    PENDING = \"pending\",\n    PROCESSING = \"processing\",\n    COMPLETED = \"completed\",\n    FAILED = \"failed\"\n}\n\nexport interface ImportExportTaskStats {\n    [ImportExportTaskStatus.PENDING]: number;\n    [ImportExportTaskStatus.PROCESSING]: number;\n    [ImportExportTaskStatus.COMPLETED]: number;\n    [ImportExportTaskStatus.FAILED]: number;\n    total: number;\n}\n\ninterface CreatedBy {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ImportExportTask {\n    id: string;\n    parent: string;\n    status: ImportExportTaskStatus;\n    data: Record<string, any>;\n    stats: ImportExportTaskStats;\n    error: Record<string, any>;\n    input: Record<string, any>;\n    createdOn: string;\n    createdBy: CreatedBy;\n    tenant: string;\n    locale: string;\n}\n\nexport interface File {\n    id: string;\n    src: string;\n}\n\nexport interface MetaResponse {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsGetParams {\n    where: {\n        id: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsListParams {\n    where: {\n        tenant: string;\n        locale: string;\n    };\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport type ImportExportTaskStorageOperationsListResponse = [ImportExportTask[], MetaResponse];\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsCreateParams {\n    input: Record<string, any>;\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateParams {\n    input: Record<string, any>;\n    original: ImportExportTask;\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsDeleteParams {\n    task: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsGetSubTaskParams {\n    where: {\n        id: string;\n        parent: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsListSubTaskParams {\n    where: {\n        tenant: string;\n        locale: string;\n        parent: string;\n        status: ImportExportTaskStatus;\n        createdBy?: string;\n    };\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport type ImportExportTaskStorageOperationsListSubTaskResponse = [\n    ImportExportTask[],\n    MetaResponse\n];\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsCreateSubTaskParams {\n    input: Record<string, any>;\n    subTask: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateSubTaskParams {\n    input: Record<string, any>;\n    original: ImportExportTask;\n    subTask: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperationsUpdateTaskStatsParams {\n    input: {\n        prevStatus: ImportExportTaskStatus;\n        nextStatus: ImportExportTaskStatus;\n    };\n    original: ImportExportTask;\n}\n\n/**\n * @category StorageOperations\n * @category ImportExportTaskStorageOperations\n */\nexport interface ImportExportTaskStorageOperations {\n    /**\n     * Get a single  import export task item by given params.\n     */\n    getTask(params: ImportExportTaskStorageOperationsGetParams): Promise<ImportExportTask | null>;\n\n    /**\n     * Get all  import export tasks by given params.\n     */\n    listTasks(\n        params: ImportExportTaskStorageOperationsListParams\n    ): Promise<ImportExportTaskStorageOperationsListResponse>;\n\n    createTask(params: ImportExportTaskStorageOperationsCreateParams): Promise<ImportExportTask>;\n\n    updateTask(params: ImportExportTaskStorageOperationsUpdateParams): Promise<ImportExportTask>;\n\n    deleteTask(params: ImportExportTaskStorageOperationsDeleteParams): Promise<ImportExportTask>;\n\n    updateTaskStats(\n        params: ImportExportTaskStorageOperationsUpdateTaskStatsParams\n    ): Promise<ImportExportTask>;\n\n    /**\n     * Get a single  import export sub-task item by given params.\n     */\n    getSubTask(\n        params: ImportExportTaskStorageOperationsGetSubTaskParams\n    ): Promise<ImportExportTask | null>;\n\n    /**\n     * Get all  import export sub-tasks by given params.\n     */\n    listSubTasks(\n        params: ImportExportTaskStorageOperationsListSubTaskParams\n    ): Promise<ImportExportTaskStorageOperationsListSubTaskResponse>;\n\n    createSubTask(\n        params: ImportExportTaskStorageOperationsCreateSubTaskParams\n    ): Promise<ImportExportTask>;\n\n    updateSubTask(\n        params: ImportExportTaskStorageOperationsUpdateSubTaskParams\n    ): Promise<ImportExportTask>;\n}\n\nexport interface FileUploadsData {\n    /**\n     * Location of export data file. Export data contains the relevant entity data (block, page, template), and an\n     * array of file objects, exported from the DB, that need to be imported.\n     *\n     * Example:\n     * 'IMPORTS/8lf6y7xp5/8lf6x9v68-header-1/8lf6x9v69-header-1/Header #1.json'\n     */\n    data: string;\n    /**\n     * Example:\n     * '8ldspraka-9l9iaffak-1.jpeg': 'IMPORTS/8lf6y7xp5/8lf6x9v68-header-1/assets/8ldspraka-9l9iaffak-1.jpeg',\n     * '8ldwyq8ao-pb-editor-page-element-rzfKWtdTWN.png': 'IMPORTS/8lf6y7xp5/8lf6x9v69-header-1/assets/8ldwyq8ao-pb-editor-page-element-rzfKWtdTWN.png'\n     */\n    assets: Record<string, string>;\n}\n\nexport interface ImportData {\n    assets: Record<string, string>;\n    data: string;\n    key: string;\n}\n"],"mappings":";;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,MAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,MAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,MAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AAEA;AAAA,IACYS,kBAAkB,0BAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAA,OAAlBA,kBAAkB;AAAA;AAAAJ,OAAA,CAAAI,kBAAA,GAAAA,kBAAA;AAAA,IAKlBC,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA;AA8ClC;AACA;AACA;AACA;AASA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AAUA;AACA;AACA;AACA;AAcA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AASA;AACA;AACA;AACA;AAHAL,OAAA,CAAAK,sBAAA,GAAAA,sBAAA"}