@webiny/api-headless-cms-es-tasks 6.6.0-alpha.0 → 6.6.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-es-tasks",
-	"version": "6.6.0-alpha.0",
+	"version": "6.6.0-alpha.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,23 +17,22 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-core": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms-utils-os": "6.6.0-alpha.0",
-		"@webiny/api-opensearch": "6.6.0-alpha.0",
-		"@webiny/background-tasks": "6.6.0-alpha.0",
-		"@webiny/error": "6.6.0-alpha.0",
-		"@webiny/feature": "6.6.0-alpha.0",
-		"@webiny/utils": "6.6.0-alpha.0"
+		"@webiny/api-core": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms-utils-os": "6.6.0-alpha.1",
+		"@webiny/api-opensearch": "6.6.0-alpha.1",
+		"@webiny/background-tasks": "6.6.0-alpha.1",
+		"@webiny/feature": "6.6.0-alpha.1",
+		"@webiny/utils": "6.6.0-alpha.1"
 	},
 	"devDependencies": {
-		"@webiny/api-graphql": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms-testing": "6.6.0-alpha.0",
-		"@webiny/build-tools": "6.6.0-alpha.0",
-		"@webiny/db-dynamodb": "6.6.0-alpha.0",
-		"@webiny/project-utils": "6.6.0-alpha.0",
+		"@webiny/api-graphql": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms-testing": "6.6.0-alpha.1",
+		"@webiny/build-tools": "6.6.0-alpha.1",
+		"@webiny/db-dynamodb": "6.6.0-alpha.1",
+		"@webiny/wcp": "6.6.0-alpha.1",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"

package/tasks/MockDataManager/MockDataManager.d.ts

@@ -2,10 +2,12 @@ import type { IMockDataManagerInput, IMockDataManagerOutput } from "../../tasks/
 import type { Context } from "../../types.js";
 import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
 import { OpenSearchClient } from "@webiny/api-opensearch/exports/api/opensearch.js";
+import type { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 export declare class MockDataManager<I extends IMockDataManagerInput, O extends IMockDataManagerOutput> {
     private readonly context;
     private readonly openSearchClient;
-    constructor(context: Context, openSearchClient: OpenSearchClient.Interface);
+    private readonly indexProvider;
+    constructor(context: Context, openSearchClient: OpenSearchClient.Interface, indexProvider: CmsModelOpenSearchIndexProvider.Interface);
     execute(params: TaskDefinition.RunParams<I, O>): Promise<TaskDefinition.Result<I, O>>;
     private listChildTasksNotDone;
     private abortChildTasks;

package/tasks/MockDataManager/MockDataManager.js

@@ -5,9 +5,10 @@ import { createModelAndGroup } from "./createModelAndGroup.js";
 import { disableIndexing, enableIndexing } from "../../utils/index.js";
 import { MOCK_DATA_CREATOR_TASK_ID } from "../MockDataCreatorTask.js";
 class MockDataManager {
-    constructor(context, openSearchClient){
+    constructor(context, openSearchClient, indexProvider){
         this.context = context;
         this.openSearchClient = openSearchClient;
+        this.indexProvider = indexProvider;
     }
     async execute(params) {
         const { input, controller } = params;
@@ -28,7 +29,8 @@ class MockDataManager {
                 model: {
                     modelId: input.modelId,
                     tenant: "root"
-                }
+                },
+                indexProvider: this.indexProvider
             });
             return controller.response.done();
         }
@@ -40,7 +42,8 @@ class MockDataManager {
         if ("string" == typeof result) return controller.response.done(result);
         await disableIndexing({
             model: result.model,
-            client: this.openSearchClient.use()
+            client: this.openSearchClient.use(),
+            indexProvider: this.indexProvider
         });
         const { amountOfTasks, amountOfRecords } = calculateAmounts(input.amount);
         const seconds = calculateSeconds(amountOfRecords);

package/tasks/MockDataManager/MockDataManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasks/MockDataManager/MockDataManager.js","sources":["../../../src/tasks/MockDataManager/MockDataManager.ts"],"sourcesContent":["import { TaskDataStatus, AbortTaskUseCase, ListTasksUseCase } from \"@webiny/background-tasks/api\";\nimport type {\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n} from \"~/tasks/MockDataManager/types.js\";\nimport { calculateAmounts } from \"./calculateAmounts.js\";\nimport type { IMockDataCreatorInput } from \"~/tasks/MockDataCreator/types.js\";\nimport { calculateSeconds, WAIT_MAX_SECONDS } from \"./calculateSeconds.js\";\nimport { createModelAndGroup } from \"~/tasks/MockDataManager/createModelAndGroup.js\";\nimport type { Context } from \"~/types.js\";\nimport { disableIndexing, enableIndexing } from \"~/utils/index.js\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { MOCK_DATA_CREATOR_TASK_ID } from \"~/tasks/MockDataCreatorTask.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\n\nexport class MockDataManager<I extends IMockDataManagerInput, O extends IMockDataManagerOutput> {\n    constructor(\n        private readonly context: Context,\n        private readonly openSearchClient: OpenSearchClient.Interface\n    ) {}\n\n    public async execute(\n        params: TaskDefinition.RunParams<I, O>\n    ): Promise<TaskDefinition.Result<I, O>> {\n        const { input, controller } = params;\n\n        const taskId = controller.state.getTask().id;\n        if (controller.runtime.isAborted()) {\n            await this.abortChildTasks(this.context, taskId);\n            return controller.response.aborted();\n        } else if (input.seconds) {\n            const items = await this.listChildTasksNotDone(this.context, taskId);\n\n            /**\n             * If there are still running creator tasks, we need to wait a bit more.\n             */\n            if (items.length > 0) {\n                return controller.response.continue(\n                    {\n                        ...input\n                    },\n                    {\n                        seconds: input.seconds || WAIT_MAX_SECONDS\n                    }\n                );\n            }\n            /**\n             * If there are no running tasks, we can enable indexing and finish the manager task.\n             */\n            await enableIndexing({\n                client: this.openSearchClient.use(),\n                model: {\n                    modelId: input.modelId,\n                    tenant: \"root\"\n                }\n            });\n            return controller.response.done();\n        }\n\n        const result = await createModelAndGroup({\n            context: this.context,\n            modelId: input.modelId,\n            overwrite: input.overwrite\n        });\n        if (typeof result === \"string\") {\n            return controller.response.done(result);\n        }\n\n        await disableIndexing({\n            model: result.model,\n            client: this.openSearchClient.use()\n        });\n\n        const { amountOfTasks, amountOfRecords } = calculateAmounts(input.amount);\n\n        const seconds = calculateSeconds(amountOfRecords);\n\n        for (let current = 0; current < amountOfTasks; current++) {\n            await controller.task.trigger<IMockDataCreatorInput>({\n                definition: MOCK_DATA_CREATOR_TASK_ID,\n                input: {\n                    totalAmount: amountOfRecords,\n                    createdAmount: 0\n                },\n                name: `Mock Data Creator Task #${current + 1} of ${amountOfTasks}`\n            });\n        }\n\n        return controller.response.continue(\n            {\n                ...input,\n                seconds,\n                amountOfTasks,\n                amountOfRecords\n            },\n            {\n                seconds\n            }\n        );\n    }\n\n    private async listChildTasksNotDone(context: Context, id: string): Promise<TaskService.Task[]> {\n        const { items } = await context.container.resolve(ListTasksUseCase).execute({\n            where: {\n                parentId: id,\n                taskStatus_in: [TaskDataStatus.PENDING, TaskDataStatus.RUNNING]\n            },\n            limit: 10000\n        });\n        return items;\n    }\n\n    private async abortChildTasks(context: Context, id: string): Promise<void> {\n        const items = await this.listChildTasksNotDone(context, id);\n        for (const item of items) {\n            await context.container.resolve(AbortTaskUseCase).execute({\n                id: item.id,\n                message: \"Aborted by parent task.\"\n            });\n        }\n    }\n}\n"],"names":["MockDataManager","context","openSearchClient","params","input","controller","taskId","items","WAIT_MAX_SECONDS","enableIndexing","result","createModelAndGroup","disableIndexing","amountOfTasks","amountOfRecords","calculateAmounts","seconds","calculateSeconds","current","MOCK_DATA_CREATOR_TASK_ID","id","ListTasksUseCase","TaskDataStatus","item","AbortTaskUseCase"],"mappings":";;;;;;AAgBO,MAAMA;IACT,YACqBC,OAAgB,EAChBC,gBAA4C,CAC/D;aAFmBD,OAAO,GAAPA;aACAC,gBAAgB,GAAhBA;IAClB;IAEH,MAAa,QACTC,MAAsC,EACF;QACpC,MAAM,EAAEC,KAAK,EAAEC,UAAU,EAAE,GAAGF;QAE9B,MAAMG,SAASD,WAAW,KAAK,CAAC,OAAO,GAAG,EAAE;QAC5C,IAAIA,WAAW,OAAO,CAAC,SAAS,IAAI;YAChC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAEC;YACzC,OAAOD,WAAW,QAAQ,CAAC,OAAO;QACtC;QAAO,IAAID,MAAM,OAAO,EAAE;YACtB,MAAMG,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAED;YAK7D,IAAIC,MAAM,MAAM,GAAG,GACf,OAAOF,WAAW,QAAQ,CAAC,QAAQ,CAC/B;gBACI,GAAGD,KAAK;YACZ,GACA;gBACI,SAASA,MAAM,OAAO,IAAII;YAC9B;YAMR,MAAMC,eAAe;gBACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;gBACjC,OAAO;oBACH,SAASL,MAAM,OAAO;oBACtB,QAAQ;gBACZ;YACJ;YACA,OAAOC,WAAW,QAAQ,CAAC,IAAI;QACnC;QAEA,MAAMK,SAAS,MAAMC,oBAAoB;YACrC,SAAS,IAAI,CAAC,OAAO;YACrB,SAASP,MAAM,OAAO;YACtB,WAAWA,MAAM,SAAS;QAC9B;QACA,IAAI,AAAkB,YAAlB,OAAOM,QACP,OAAOL,WAAW,QAAQ,CAAC,IAAI,CAACK;QAGpC,MAAME,gBAAgB;YAClB,OAAOF,OAAO,KAAK;YACnB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;QACrC;QAEA,MAAM,EAAEG,aAAa,EAAEC,eAAe,EAAE,GAAGC,iBAAiBX,MAAM,MAAM;QAExE,MAAMY,UAAUC,iBAAiBH;QAEjC,IAAK,IAAII,UAAU,GAAGA,UAAUL,eAAeK,UAC3C,MAAMb,WAAW,IAAI,CAAC,OAAO,CAAwB;YACjD,YAAYc;YACZ,OAAO;gBACH,aAAaL;gBACb,eAAe;YACnB;YACA,MAAM,CAAC,wBAAwB,EAAEI,UAAU,EAAE,IAAI,EAAEL,eAAe;QACtE;QAGJ,OAAOR,WAAW,QAAQ,CAAC,QAAQ,CAC/B;YACI,GAAGD,KAAK;YACRY;YACAH;YACAC;QACJ,GACA;YACIE;QACJ;IAER;IAEA,MAAc,sBAAsBf,OAAgB,EAAEmB,EAAU,EAA+B;QAC3F,MAAM,EAAEb,KAAK,EAAE,GAAG,MAAMN,QAAQ,SAAS,CAAC,OAAO,CAACoB,kBAAkB,OAAO,CAAC;YACxE,OAAO;gBACH,UAAUD;gBACV,eAAe;oBAACE,eAAe,OAAO;oBAAEA,eAAe,OAAO;iBAAC;YACnE;YACA,OAAO;QACX;QACA,OAAOf;IACX;IAEA,MAAc,gBAAgBN,OAAgB,EAAEmB,EAAU,EAAiB;QACvE,MAAMb,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAACN,SAASmB;QACxD,KAAK,MAAMG,QAAQhB,MACf,MAAMN,QAAQ,SAAS,CAAC,OAAO,CAACuB,kBAAkB,OAAO,CAAC;YACtD,IAAID,KAAK,EAAE;YACX,SAAS;QACb;IAER;AACJ"}
+{"version":3,"file":"tasks/MockDataManager/MockDataManager.js","sources":["../../../src/tasks/MockDataManager/MockDataManager.ts"],"sourcesContent":["import { TaskDataStatus, AbortTaskUseCase, ListTasksUseCase } from \"@webiny/background-tasks/api\";\nimport type {\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n} from \"~/tasks/MockDataManager/types.js\";\nimport { calculateAmounts } from \"./calculateAmounts.js\";\nimport type { IMockDataCreatorInput } from \"~/tasks/MockDataCreator/types.js\";\nimport { calculateSeconds, WAIT_MAX_SECONDS } from \"./calculateSeconds.js\";\nimport { createModelAndGroup } from \"~/tasks/MockDataManager/createModelAndGroup.js\";\nimport type { StorageCmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Context } from \"~/types.js\";\nimport { disableIndexing, enableIndexing } from \"~/utils/index.js\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { MOCK_DATA_CREATOR_TASK_ID } from \"~/tasks/MockDataCreatorTask.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport type { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\n\nexport class MockDataManager<I extends IMockDataManagerInput, O extends IMockDataManagerOutput> {\n    constructor(\n        private readonly context: Context,\n        private readonly openSearchClient: OpenSearchClient.Interface,\n        private readonly indexProvider: CmsModelOpenSearchIndexProvider.Interface\n    ) {}\n\n    public async execute(\n        params: TaskDefinition.RunParams<I, O>\n    ): Promise<TaskDefinition.Result<I, O>> {\n        const { input, controller } = params;\n\n        const taskId = controller.state.getTask().id;\n        if (controller.runtime.isAborted()) {\n            await this.abortChildTasks(this.context, taskId);\n            return controller.response.aborted();\n        } else if (input.seconds) {\n            const items = await this.listChildTasksNotDone(this.context, taskId);\n\n            /**\n             * If there are still running creator tasks, we need to wait a bit more.\n             */\n            if (items.length > 0) {\n                return controller.response.continue(\n                    {\n                        ...input\n                    },\n                    {\n                        seconds: input.seconds || WAIT_MAX_SECONDS\n                    }\n                );\n            }\n            /**\n             * If there are no running tasks, we can enable indexing and finish the manager task.\n             */\n            await enableIndexing({\n                client: this.openSearchClient.use(),\n                model: {\n                    modelId: input.modelId,\n                    tenant: \"root\"\n                } as StorageCmsModel,\n                indexProvider: this.indexProvider\n            });\n            return controller.response.done();\n        }\n\n        const result = await createModelAndGroup({\n            context: this.context,\n            modelId: input.modelId,\n            overwrite: input.overwrite\n        });\n        if (typeof result === \"string\") {\n            return controller.response.done(result);\n        }\n\n        await disableIndexing({\n            model: result.model,\n            client: this.openSearchClient.use(),\n            indexProvider: this.indexProvider\n        });\n\n        const { amountOfTasks, amountOfRecords } = calculateAmounts(input.amount);\n\n        const seconds = calculateSeconds(amountOfRecords);\n\n        for (let current = 0; current < amountOfTasks; current++) {\n            await controller.task.trigger<IMockDataCreatorInput>({\n                definition: MOCK_DATA_CREATOR_TASK_ID,\n                input: {\n                    totalAmount: amountOfRecords,\n                    createdAmount: 0\n                },\n                name: `Mock Data Creator Task #${current + 1} of ${amountOfTasks}`\n            });\n        }\n\n        return controller.response.continue(\n            {\n                ...input,\n                seconds,\n                amountOfTasks,\n                amountOfRecords\n            },\n            {\n                seconds\n            }\n        );\n    }\n\n    private async listChildTasksNotDone(context: Context, id: string): Promise<TaskService.Task[]> {\n        const { items } = await context.container.resolve(ListTasksUseCase).execute({\n            where: {\n                parentId: id,\n                taskStatus_in: [TaskDataStatus.PENDING, TaskDataStatus.RUNNING]\n            },\n            limit: 10000\n        });\n        return items;\n    }\n\n    private async abortChildTasks(context: Context, id: string): Promise<void> {\n        const items = await this.listChildTasksNotDone(context, id);\n        for (const item of items) {\n            await context.container.resolve(AbortTaskUseCase).execute({\n                id: item.id,\n                message: \"Aborted by parent task.\"\n            });\n        }\n    }\n}\n"],"names":["MockDataManager","context","openSearchClient","indexProvider","params","input","controller","taskId","items","WAIT_MAX_SECONDS","enableIndexing","result","createModelAndGroup","disableIndexing","amountOfTasks","amountOfRecords","calculateAmounts","seconds","calculateSeconds","current","MOCK_DATA_CREATOR_TASK_ID","id","ListTasksUseCase","TaskDataStatus","item","AbortTaskUseCase"],"mappings":";;;;;;AAkBO,MAAMA;IACT,YACqBC,OAAgB,EAChBC,gBAA4C,EAC5CC,aAAwD,CAC3E;aAHmBF,OAAO,GAAPA;aACAC,gBAAgB,GAAhBA;aACAC,aAAa,GAAbA;IAClB;IAEH,MAAa,QACTC,MAAsC,EACF;QACpC,MAAM,EAAEC,KAAK,EAAEC,UAAU,EAAE,GAAGF;QAE9B,MAAMG,SAASD,WAAW,KAAK,CAAC,OAAO,GAAG,EAAE;QAC5C,IAAIA,WAAW,OAAO,CAAC,SAAS,IAAI;YAChC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAEC;YACzC,OAAOD,WAAW,QAAQ,CAAC,OAAO;QACtC;QAAO,IAAID,MAAM,OAAO,EAAE;YACtB,MAAMG,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAED;YAK7D,IAAIC,MAAM,MAAM,GAAG,GACf,OAAOF,WAAW,QAAQ,CAAC,QAAQ,CAC/B;gBACI,GAAGD,KAAK;YACZ,GACA;gBACI,SAASA,MAAM,OAAO,IAAII;YAC9B;YAMR,MAAMC,eAAe;gBACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;gBACjC,OAAO;oBACH,SAASL,MAAM,OAAO;oBACtB,QAAQ;gBACZ;gBACA,eAAe,IAAI,CAAC,aAAa;YACrC;YACA,OAAOC,WAAW,QAAQ,CAAC,IAAI;QACnC;QAEA,MAAMK,SAAS,MAAMC,oBAAoB;YACrC,SAAS,IAAI,CAAC,OAAO;YACrB,SAASP,MAAM,OAAO;YACtB,WAAWA,MAAM,SAAS;QAC9B;QACA,IAAI,AAAkB,YAAlB,OAAOM,QACP,OAAOL,WAAW,QAAQ,CAAC,IAAI,CAACK;QAGpC,MAAME,gBAAgB;YAClB,OAAOF,OAAO,KAAK;YACnB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;YACjC,eAAe,IAAI,CAAC,aAAa;QACrC;QAEA,MAAM,EAAEG,aAAa,EAAEC,eAAe,EAAE,GAAGC,iBAAiBX,MAAM,MAAM;QAExE,MAAMY,UAAUC,iBAAiBH;QAEjC,IAAK,IAAII,UAAU,GAAGA,UAAUL,eAAeK,UAC3C,MAAMb,WAAW,IAAI,CAAC,OAAO,CAAwB;YACjD,YAAYc;YACZ,OAAO;gBACH,aAAaL;gBACb,eAAe;YACnB;YACA,MAAM,CAAC,wBAAwB,EAAEI,UAAU,EAAE,IAAI,EAAEL,eAAe;QACtE;QAGJ,OAAOR,WAAW,QAAQ,CAAC,QAAQ,CAC/B;YACI,GAAGD,KAAK;YACRY;YACAH;YACAC;QACJ,GACA;YACIE;QACJ;IAER;IAEA,MAAc,sBAAsBhB,OAAgB,EAAEoB,EAAU,EAA+B;QAC3F,MAAM,EAAEb,KAAK,EAAE,GAAG,MAAMP,QAAQ,SAAS,CAAC,OAAO,CAACqB,kBAAkB,OAAO,CAAC;YACxE,OAAO;gBACH,UAAUD;gBACV,eAAe;oBAACE,eAAe,OAAO;oBAAEA,eAAe,OAAO;iBAAC;YACnE;YACA,OAAO;QACX;QACA,OAAOf;IACX;IAEA,MAAc,gBAAgBP,OAAgB,EAAEoB,EAAU,EAAiB;QACvE,MAAMb,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAACP,SAASoB;QACxD,KAAK,MAAMG,QAAQhB,MACf,MAAMP,QAAQ,SAAS,CAAC,OAAO,CAACwB,kBAAkB,OAAO,CAAC;YACtD,IAAID,KAAK,EAAE;YACX,SAAS;QACb;IAER;AACJ"}

package/tasks/MockDataManager/createModelAndGroup.js

@@ -1,7 +1,7 @@
 import { createGroupData } from "./group.js";
 import { createCarsModel } from "./model.js";
 import { createIndex } from "../../utils/index.js";
-import { CmsEntryOpenSearchIndex } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 import { OpenSearchClient } from "@webiny/api-opensearch/exports/api/opensearch.js";
 import { ListModelsUseCase } from "@webiny/api-headless-cms/features/contentModel/ListModels/index.js";
 import { ListGroupsUseCase } from "@webiny/api-headless-cms/features/contentModelGroup/ListGroups/index.js";
@@ -32,7 +32,7 @@ const createModelAndGroup = async (params)=>{
     await createIndex({
         model,
         client: context.container.resolve(OpenSearchClient).use(),
-        indexConfigs: context.container.resolveAll(CmsEntryOpenSearchIndex)
+        indexProvider: context.container.resolve(CmsModelOpenSearchIndexProvider)
     });
     return {
         group: group,

package/tasks/MockDataManager/createModelAndGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasks/MockDataManager/createModelAndGroup.js","sources":["../../../src/tasks/MockDataManager/createModelAndGroup.ts"],"sourcesContent":["import type { CmsGroup, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Context } from \"~/types.js\";\nimport { createGroupData } from \"./group.js\";\nimport { createCarsModel } from \"./model.js\";\nimport { createIndex } from \"~/utils/index.js\";\nimport { CmsEntryOpenSearchIndex } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { ListGroupsUseCase } from \"@webiny/api-headless-cms/features/contentModelGroup/ListGroups/index.js\";\nimport { CreateGroupUseCase } from \"@webiny/api-headless-cms/features/contentModelGroup/CreateGroup/index.js\";\nimport { CreateModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/CreateModel/index.js\";\n\ninterface ICreateModelAndGroupParams {\n    context: Context;\n    modelId: string;\n    overwrite?: boolean;\n}\nexport interface ICreateModelAndGroupResultSuccess {\n    group: CmsGroup;\n    model: CmsModel;\n}\nexport type ICreateModelAndGroupResult = string | ICreateModelAndGroupResultSuccess;\n\nexport const createModelAndGroup = async (\n    params: ICreateModelAndGroupParams\n): Promise<ICreateModelAndGroupResult> => {\n    const { context, modelId, overwrite = false } = params;\n    /**\n     * First we need to check if the model already exists in the database. If not, we need to create it.\n     */\n    const modelsResult = await context.container.resolve(ListModelsUseCase).execute();\n    if (modelsResult.isFail()) {\n        throw modelsResult.error;\n    }\n    let model = modelsResult.value.find(m => m.modelId === modelId);\n    let group: CmsGroup | undefined;\n    if (model && !overwrite) {\n        return `Model \"${modelId}\" already exists.`;\n    } else if (!model) {\n        const groupsResult = await context.container.resolve(ListGroupsUseCase).execute();\n        if (groupsResult.isFail()) {\n            throw groupsResult.error;\n        }\n        group = groupsResult.value.find(g => g.slug === \"mocks\");\n        if (!group) {\n            const groupData = createGroupData();\n            const createGroupResult = await context.container\n                .resolve(CreateGroupUseCase)\n                .execute(groupData);\n            if (createGroupResult.isFail()) {\n                throw createGroupResult.error;\n            }\n            group = createGroupResult.value;\n        }\n        /**\n         * Possibly we need to create the model.\n         */\n        const carsModel = createCarsModel(group);\n        const createModelResult = await context.container\n            .resolve(CreateModelUseCase)\n            .execute(carsModel);\n        if (createModelResult.isFail()) {\n            throw createModelResult.error;\n        }\n        model = createModelResult.value;\n    }\n    await createIndex({\n        model,\n        client: context.container.resolve(OpenSearchClient).use(),\n        indexConfigs: context.container.resolveAll(CmsEntryOpenSearchIndex)\n    });\n\n    return {\n        group: group as CmsGroup,\n        model: model as CmsModel\n    };\n};\n"],"names":["createModelAndGroup","params","context","modelId","overwrite","modelsResult","ListModelsUseCase","model","m","group","groupsResult","ListGroupsUseCase","g","groupData","createGroupData","createGroupResult","CreateGroupUseCase","carsModel","createCarsModel","createModelResult","CreateModelUseCase","createIndex","OpenSearchClient","CmsEntryOpenSearchIndex"],"mappings":";;;;;;;;;AAuBO,MAAMA,sBAAsB,OAC/BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,YAAY,KAAK,EAAE,GAAGH;IAIhD,MAAMI,eAAe,MAAMH,QAAQ,SAAS,CAAC,OAAO,CAACI,mBAAmB,OAAO;IAC/E,IAAID,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;IAE5B,IAAIE,QAAQF,aAAa,KAAK,CAAC,IAAI,CAACG,CAAAA,IAAKA,EAAE,OAAO,KAAKL;IACvD,IAAIM;IACJ,IAAIF,SAAS,CAACH,WACV,OAAO,CAAC,OAAO,EAAED,QAAQ,iBAAiB,CAAC;IACxC,IAAI,CAACI,OAAO;QACf,MAAMG,eAAe,MAAMR,QAAQ,SAAS,CAAC,OAAO,CAACS,mBAAmB,OAAO;QAC/E,IAAID,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAE5BD,QAAQC,aAAa,KAAK,CAAC,IAAI,CAACE,CAAAA,IAAKA,AAAW,YAAXA,EAAE,IAAI;QAC3C,IAAI,CAACH,OAAO;YACR,MAAMI,YAAYC;YAClB,MAAMC,oBAAoB,MAAMb,QAAQ,SAAS,CAC5C,OAAO,CAACc,oBACR,OAAO,CAACH;YACb,IAAIE,kBAAkB,MAAM,IACxB,MAAMA,kBAAkB,KAAK;YAEjCN,QAAQM,kBAAkB,KAAK;QACnC;QAIA,MAAME,YAAYC,gBAAgBT;QAClC,MAAMU,oBAAoB,MAAMjB,QAAQ,SAAS,CAC5C,OAAO,CAACkB,oBACR,OAAO,CAACH;QACb,IAAIE,kBAAkB,MAAM,IACxB,MAAMA,kBAAkB,KAAK;QAEjCZ,QAAQY,kBAAkB,KAAK;IACnC;IACA,MAAME,YAAY;QACdd;QACA,QAAQL,QAAQ,SAAS,CAAC,OAAO,CAACoB,kBAAkB,GAAG;QACvD,cAAcpB,QAAQ,SAAS,CAAC,UAAU,CAACqB;IAC/C;IAEA,OAAO;QACH,OAAOd;QACP,OAAOF;IACX;AACJ"}
+{"version":3,"file":"tasks/MockDataManager/createModelAndGroup.js","sources":["../../../src/tasks/MockDataManager/createModelAndGroup.ts"],"sourcesContent":["import type { CmsGroup, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Context } from \"~/types.js\";\nimport { createGroupData } from \"./group.js\";\nimport { createCarsModel } from \"./model.js\";\nimport { createIndex } from \"~/utils/index.js\";\nimport { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { ListGroupsUseCase } from \"@webiny/api-headless-cms/features/contentModelGroup/ListGroups/index.js\";\nimport { CreateGroupUseCase } from \"@webiny/api-headless-cms/features/contentModelGroup/CreateGroup/index.js\";\nimport { CreateModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/CreateModel/index.js\";\n\ninterface ICreateModelAndGroupParams {\n    context: Context;\n    modelId: string;\n    overwrite?: boolean;\n}\nexport interface ICreateModelAndGroupResultSuccess {\n    group: CmsGroup;\n    model: CmsModel;\n}\nexport type ICreateModelAndGroupResult = string | ICreateModelAndGroupResultSuccess;\n\nexport const createModelAndGroup = async (\n    params: ICreateModelAndGroupParams\n): Promise<ICreateModelAndGroupResult> => {\n    const { context, modelId, overwrite = false } = params;\n    /**\n     * First we need to check if the model already exists in the database. If not, we need to create it.\n     */\n    const modelsResult = await context.container.resolve(ListModelsUseCase).execute();\n    if (modelsResult.isFail()) {\n        throw modelsResult.error;\n    }\n    let model = modelsResult.value.find(m => m.modelId === modelId);\n    let group: CmsGroup | undefined;\n    if (model && !overwrite) {\n        return `Model \"${modelId}\" already exists.`;\n    } else if (!model) {\n        const groupsResult = await context.container.resolve(ListGroupsUseCase).execute();\n        if (groupsResult.isFail()) {\n            throw groupsResult.error;\n        }\n        group = groupsResult.value.find(g => g.slug === \"mocks\");\n        if (!group) {\n            const groupData = createGroupData();\n            const createGroupResult = await context.container\n                .resolve(CreateGroupUseCase)\n                .execute(groupData);\n            if (createGroupResult.isFail()) {\n                throw createGroupResult.error;\n            }\n            group = createGroupResult.value;\n        }\n        /**\n         * Possibly we need to create the model.\n         */\n        const carsModel = createCarsModel(group);\n        const createModelResult = await context.container\n            .resolve(CreateModelUseCase)\n            .execute(carsModel);\n        if (createModelResult.isFail()) {\n            throw createModelResult.error;\n        }\n        model = createModelResult.value;\n    }\n    await createIndex({\n        model,\n        client: context.container.resolve(OpenSearchClient).use(),\n        indexProvider: context.container.resolve(CmsModelOpenSearchIndexProvider)\n    });\n\n    return {\n        group: group as CmsGroup,\n        model: model as CmsModel\n    };\n};\n"],"names":["createModelAndGroup","params","context","modelId","overwrite","modelsResult","ListModelsUseCase","model","m","group","groupsResult","ListGroupsUseCase","g","groupData","createGroupData","createGroupResult","CreateGroupUseCase","carsModel","createCarsModel","createModelResult","CreateModelUseCase","createIndex","OpenSearchClient","CmsModelOpenSearchIndexProvider"],"mappings":";;;;;;;;;AAuBO,MAAMA,sBAAsB,OAC/BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,YAAY,KAAK,EAAE,GAAGH;IAIhD,MAAMI,eAAe,MAAMH,QAAQ,SAAS,CAAC,OAAO,CAACI,mBAAmB,OAAO;IAC/E,IAAID,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;IAE5B,IAAIE,QAAQF,aAAa,KAAK,CAAC,IAAI,CAACG,CAAAA,IAAKA,EAAE,OAAO,KAAKL;IACvD,IAAIM;IACJ,IAAIF,SAAS,CAACH,WACV,OAAO,CAAC,OAAO,EAAED,QAAQ,iBAAiB,CAAC;IACxC,IAAI,CAACI,OAAO;QACf,MAAMG,eAAe,MAAMR,QAAQ,SAAS,CAAC,OAAO,CAACS,mBAAmB,OAAO;QAC/E,IAAID,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAE5BD,QAAQC,aAAa,KAAK,CAAC,IAAI,CAACE,CAAAA,IAAKA,AAAW,YAAXA,EAAE,IAAI;QAC3C,IAAI,CAACH,OAAO;YACR,MAAMI,YAAYC;YAClB,MAAMC,oBAAoB,MAAMb,QAAQ,SAAS,CAC5C,OAAO,CAACc,oBACR,OAAO,CAACH;YACb,IAAIE,kBAAkB,MAAM,IACxB,MAAMA,kBAAkB,KAAK;YAEjCN,QAAQM,kBAAkB,KAAK;QACnC;QAIA,MAAME,YAAYC,gBAAgBT;QAClC,MAAMU,oBAAoB,MAAMjB,QAAQ,SAAS,CAC5C,OAAO,CAACkB,oBACR,OAAO,CAACH;QACb,IAAIE,kBAAkB,MAAM,IACxB,MAAMA,kBAAkB,KAAK;QAEjCZ,QAAQY,kBAAkB,KAAK;IACnC;IACA,MAAME,YAAY;QACdd;QACA,QAAQL,QAAQ,SAAS,CAAC,OAAO,CAACoB,kBAAkB,GAAG;QACvD,eAAepB,QAAQ,SAAS,CAAC,OAAO,CAACqB;IAC7C;IAEA,OAAO;QACH,OAAOd;QACP,OAAOF;IACX;AACJ"}

package/tasks/MockDataManagerTask.d.ts

@@ -2,15 +2,17 @@ import type { IMockDataManagerInput, IMockDataManagerOutput } from "../tasks/Moc
 import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
 import { CmsContext } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 import { OpenSearchClient } from "@webiny/api-opensearch/exports/api/opensearch.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 export declare const MOCK_DATA_MANAGER_TASK_ID = "mockDataManager";
 declare class MockDataManagerTask implements TaskDefinition.Interface<IMockDataManagerInput, IMockDataManagerOutput> {
     private readonly context;
     private readonly openSearchClient;
+    private readonly indexProvider;
     id: string;
     title: string;
     maxIterations: number;
     selfCleanup: "always";
-    constructor(context: CmsContext.Interface, openSearchClient: OpenSearchClient.Interface);
+    constructor(context: CmsContext.Interface, openSearchClient: OpenSearchClient.Interface, indexProvider: CmsModelOpenSearchIndexProvider.Interface);
     run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>): Promise<TaskDefinition.Result<IMockDataManagerInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions.js").ITaskOutput>>;
     onError(): Promise<void>;
     onAbort(): Promise<void>;

package/tasks/MockDataManagerTask.js

@@ -3,19 +3,21 @@ import { enableIndexing } from "../utils/index.js";
 import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
 import { CmsContext } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 import { OpenSearchClient } from "@webiny/api-opensearch/exports/api/opensearch.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 import { MockDataManager } from "./MockDataManager/MockDataManager.js";
 const MOCK_DATA_MANAGER_TASK_ID = "mockDataManager";
 class MockDataManagerTask {
-    constructor(context, openSearchClient){
+    constructor(context, openSearchClient, indexProvider){
         this.context = context;
         this.openSearchClient = openSearchClient;
+        this.indexProvider = indexProvider;
         this.id = MOCK_DATA_MANAGER_TASK_ID;
         this.title = "Mock Data Manager";
         this.maxIterations = 500;
         this.selfCleanup = "always";
     }
     async run(params) {
-        const carsMock = new MockDataManager(this.context, this.openSearchClient);
+        const carsMock = new MockDataManager(this.context, this.openSearchClient, this.indexProvider);
         try {
             return await carsMock.execute({
                 ...params,
@@ -34,7 +36,8 @@ class MockDataManagerTask {
             model: {
                 modelId: CARS_MODEL_ID,
                 tenant: "root"
-            }
+            },
+            indexProvider: this.indexProvider
         });
     }
     async onAbort() {
@@ -43,7 +46,8 @@ class MockDataManagerTask {
             model: {
                 modelId: CARS_MODEL_ID,
                 tenant: "root"
-            }
+            },
+            indexProvider: this.indexProvider
         });
     }
 }
@@ -51,7 +55,8 @@ const MockDataManagerTaskDefinition = TaskDefinition.createImplementation({
     implementation: MockDataManagerTask,
     dependencies: [
         CmsContext,
-        OpenSearchClient
+        OpenSearchClient,
+        CmsModelOpenSearchIndexProvider
     ]
 });
 export { MOCK_DATA_MANAGER_TASK_ID, MockDataManagerTaskDefinition };

package/tasks/MockDataManagerTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasks/MockDataManagerTask.js","sources":["../../src/tasks/MockDataManagerTask.ts"],"sourcesContent":["import type { Context } from \"~/types.js\";\nimport type {\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n} from \"~/tasks/MockDataManager/types.js\";\nimport { CARS_MODEL_ID } from \"~/tasks/MockDataManager/constants.js\";\nimport { enableIndexing } from \"~/utils/index.js\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { CmsContext } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { MockDataManager } from \"./MockDataManager/MockDataManager.js\";\n\nexport const MOCK_DATA_MANAGER_TASK_ID = \"mockDataManager\";\n\nclass MockDataManagerTask implements TaskDefinition.Interface<\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n> {\n    id = MOCK_DATA_MANAGER_TASK_ID;\n    title = \"Mock Data Manager\";\n    maxIterations = 500;\n\n    selfCleanup = \"always\" as const;\n\n    constructor(\n        private readonly context: CmsContext.Interface,\n        private readonly openSearchClient: OpenSearchClient.Interface\n    ) {}\n\n    async run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>) {\n        const carsMock = new MockDataManager<IMockDataManagerInput, IMockDataManagerOutput>(\n            this.context as Context,\n            this.openSearchClient\n        );\n\n        try {\n            return await carsMock.execute({\n                ...params,\n                input: {\n                    ...params.input,\n                    modelId: CARS_MODEL_ID\n                }\n            });\n        } catch (ex) {\n            return params.controller.response.error(ex);\n        }\n    }\n    async onError() {\n        await enableIndexing({\n            client: this.openSearchClient.use(),\n            model: {\n                modelId: CARS_MODEL_ID,\n                tenant: \"root\"\n            }\n        });\n    }\n\n    async onAbort() {\n        await enableIndexing({\n            client: this.openSearchClient.use(),\n            model: {\n                modelId: CARS_MODEL_ID,\n                tenant: \"root\"\n            }\n        });\n    }\n}\n\nexport const MockDataManagerTaskDefinition = TaskDefinition.createImplementation({\n    implementation: MockDataManagerTask,\n    dependencies: [CmsContext, OpenSearchClient]\n});\n"],"names":["MOCK_DATA_MANAGER_TASK_ID","MockDataManagerTask","context","openSearchClient","params","carsMock","MockDataManager","CARS_MODEL_ID","ex","enableIndexing","MockDataManagerTaskDefinition","TaskDefinition","CmsContext","OpenSearchClient"],"mappings":";;;;;;AAYO,MAAMA,4BAA4B;AAEzC,MAAMC;IAUF,YACqBC,OAA6B,EAC7BC,gBAA4C,CAC/D;aAFmBD,OAAO,GAAPA;aACAC,gBAAgB,GAAhBA;aARrB,EAAE,GAAGH;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAEhB,WAAW,GAAG;IAKX;IAEH,MAAM,IAAII,MAA+E,EAAE;QACvF,MAAMC,WAAW,IAAIC,gBACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,gBAAgB;QAGzB,IAAI;YACA,OAAO,MAAMD,SAAS,OAAO,CAAC;gBAC1B,GAAGD,MAAM;gBACT,OAAO;oBACH,GAAGA,OAAO,KAAK;oBACf,SAASG;gBACb;YACJ;QACJ,EAAE,OAAOC,IAAI;YACT,OAAOJ,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAACI;QAC5C;IACJ;IACA,MAAM,UAAU;QACZ,MAAMC,eAAe;YACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;YACjC,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;QACJ;IACJ;IAEA,MAAM,UAAU;QACZ,MAAME,eAAe;YACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;YACjC,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;QACJ;IACJ;AACJ;AAEO,MAAMG,gCAAgCC,eAAe,oBAAoB,CAAC;IAC7E,gBAAgBV;IAChB,cAAc;QAACW;QAAYC;KAAiB;AAChD"}
+{"version":3,"file":"tasks/MockDataManagerTask.js","sources":["../../src/tasks/MockDataManagerTask.ts"],"sourcesContent":["import type { StorageCmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Context } from \"~/types.js\";\nimport type {\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n} from \"~/tasks/MockDataManager/types.js\";\nimport { CARS_MODEL_ID } from \"~/tasks/MockDataManager/constants.js\";\nimport { enableIndexing } from \"~/utils/index.js\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { CmsContext } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { OpenSearchClient } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { MockDataManager } from \"./MockDataManager/MockDataManager.js\";\n\nexport const MOCK_DATA_MANAGER_TASK_ID = \"mockDataManager\";\n\nclass MockDataManagerTask implements TaskDefinition.Interface<\n    IMockDataManagerInput,\n    IMockDataManagerOutput\n> {\n    id = MOCK_DATA_MANAGER_TASK_ID;\n    title = \"Mock Data Manager\";\n    maxIterations = 500;\n\n    selfCleanup = \"always\" as const;\n\n    constructor(\n        private readonly context: CmsContext.Interface,\n        private readonly openSearchClient: OpenSearchClient.Interface,\n        private readonly indexProvider: CmsModelOpenSearchIndexProvider.Interface\n    ) {}\n\n    async run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>) {\n        const carsMock = new MockDataManager<IMockDataManagerInput, IMockDataManagerOutput>(\n            this.context as Context,\n            this.openSearchClient,\n            this.indexProvider\n        );\n\n        try {\n            return await carsMock.execute({\n                ...params,\n                input: {\n                    ...params.input,\n                    modelId: CARS_MODEL_ID\n                }\n            });\n        } catch (ex) {\n            return params.controller.response.error(ex);\n        }\n    }\n    async onError() {\n        await enableIndexing({\n            client: this.openSearchClient.use(),\n            model: {\n                modelId: CARS_MODEL_ID,\n                tenant: \"root\"\n            } as StorageCmsModel,\n            indexProvider: this.indexProvider\n        });\n    }\n\n    async onAbort() {\n        await enableIndexing({\n            client: this.openSearchClient.use(),\n            model: {\n                modelId: CARS_MODEL_ID,\n                tenant: \"root\"\n            } as StorageCmsModel,\n            indexProvider: this.indexProvider\n        });\n    }\n}\n\nexport const MockDataManagerTaskDefinition = TaskDefinition.createImplementation({\n    implementation: MockDataManagerTask,\n    dependencies: [CmsContext, OpenSearchClient, CmsModelOpenSearchIndexProvider]\n});\n"],"names":["MOCK_DATA_MANAGER_TASK_ID","MockDataManagerTask","context","openSearchClient","indexProvider","params","carsMock","MockDataManager","CARS_MODEL_ID","ex","enableIndexing","MockDataManagerTaskDefinition","TaskDefinition","CmsContext","OpenSearchClient","CmsModelOpenSearchIndexProvider"],"mappings":";;;;;;;AAcO,MAAMA,4BAA4B;AAEzC,MAAMC;IAUF,YACqBC,OAA6B,EAC7BC,gBAA4C,EAC5CC,aAAwD,CAC3E;aAHmBF,OAAO,GAAPA;aACAC,gBAAgB,GAAhBA;aACAC,aAAa,GAAbA;aATrB,EAAE,GAAGJ;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAEhB,WAAW,GAAG;IAMX;IAEH,MAAM,IAAIK,MAA+E,EAAE;QACvF,MAAMC,WAAW,IAAIC,gBACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa;QAGtB,IAAI;YACA,OAAO,MAAMD,SAAS,OAAO,CAAC;gBAC1B,GAAGD,MAAM;gBACT,OAAO;oBACH,GAAGA,OAAO,KAAK;oBACf,SAASG;gBACb;YACJ;QACJ,EAAE,OAAOC,IAAI;YACT,OAAOJ,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAACI;QAC5C;IACJ;IACA,MAAM,UAAU;QACZ,MAAMC,eAAe;YACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;YACjC,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;YACA,eAAe,IAAI,CAAC,aAAa;QACrC;IACJ;IAEA,MAAM,UAAU;QACZ,MAAME,eAAe;YACjB,QAAQ,IAAI,CAAC,gBAAgB,CAAC,GAAG;YACjC,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;YACA,eAAe,IAAI,CAAC,aAAa;QACrC;IACJ;AACJ;AAEO,MAAMG,gCAAgCC,eAAe,oBAAoB,CAAC;IAC7E,gBAAgBX;IAChB,cAAc;QAACY;QAAYC;QAAkBC;KAAgC;AACjF"}

package/utils/createIndex.d.ts

@@ -1,9 +1,9 @@
 import type { Client } from "@webiny/api-opensearch";
-import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
-import type { CmsEntryOpenSearchIndex } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
+import type { StorageCmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 export interface ICreateIndexParams {
     client: Client;
-    model: Pick<CmsModel, "modelId" | "tenant" | "group">;
-    indexConfigs: CmsEntryOpenSearchIndex.Interface[];
+    model: StorageCmsModel;
+    indexProvider: CmsModelOpenSearchIndexProvider.Interface;
 }
 export declare const createIndex: (params: ICreateIndexParams) => Promise<void>;

package/utils/createIndex.js

@@ -1,23 +1,19 @@
-import { WebinyError } from "@webiny/error";
-import { configurations } from "@webiny/api-headless-cms-utils-os/configurations.js";
+import { getOpenSearchIndexPrefix } from "@webiny/api-opensearch";
 const createIndex = async (params)=>{
-    const { client, model, indexConfigs } = params;
-    const { index } = configurations.es({
+    const { client, model, indexProvider } = params;
+    const { index: rawIndex, settings } = await indexProvider.execute({
         model
     });
+    const prefix = getOpenSearchIndexPrefix();
+    const index = prefix ? prefix + rawIndex : rawIndex;
     const result = await client.indices.exists({
         index
     });
     if (result.body) return;
-    const usable = indexConfigs.filter((c)=>c.canUse({
-            model
-        }));
-    if (0 === usable.length) throw new WebinyError("Could not find a single usable CmsEntryOpenSearchIndex.", "OPENSEARCH_INDEX_TEMPLATE_ERROR");
-    const config = usable[usable.length - 1];
     await client.indices.create({
         index,
         body: {
-            ...config.body
+            ...settings
         }
     });
 };

package/utils/createIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils/createIndex.js","sources":["../../src/utils/createIndex.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport { WebinyError } from \"@webiny/error\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { configurations } from \"@webiny/api-headless-cms-utils-os/configurations.js\";\nimport type { CmsEntryOpenSearchIndex } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\n\nexport interface ICreateIndexParams {\n    client: Client;\n    model: Pick<CmsModel, \"modelId\" | \"tenant\" | \"group\">;\n    indexConfigs: CmsEntryOpenSearchIndex.Interface[];\n}\n\nexport const createIndex = async (params: ICreateIndexParams): Promise<void> => {\n    const { client, model, indexConfigs } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n\n    const result = await client.indices.exists({\n        index\n    });\n    if (result.body) {\n        return;\n    }\n\n    const usable = indexConfigs.filter(c => c.canUse({ model }));\n    if (usable.length === 0) {\n        /**\n         * Should not happen in production as we have a default index configuration, but it can happen in tests if the test setup is not correct.\n         */\n        throw new WebinyError(\n            \"Could not find a single usable CmsEntryOpenSearchIndex.\",\n            \"OPENSEARCH_INDEX_TEMPLATE_ERROR\"\n        );\n    }\n    const config = usable[usable.length - 1];\n\n    await client.indices.create({\n        index,\n        body: {\n            ...config.body\n        }\n    });\n};\n"],"names":["createIndex","params","client","model","indexConfigs","index","configurations","result","usable","c","WebinyError","config"],"mappings":";;AAYO,MAAMA,cAAc,OAAOC;IAC9B,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,YAAY,EAAE,GAAGH;IAExC,MAAM,EAAEI,KAAK,EAAE,GAAGC,eAAe,EAAE,CAAC;QAChCH;IACJ;IAEA,MAAMI,SAAS,MAAML,OAAO,OAAO,CAAC,MAAM,CAAC;QACvCG;IACJ;IACA,IAAIE,OAAO,IAAI,EACX;IAGJ,MAAMC,SAASJ,aAAa,MAAM,CAACK,CAAAA,IAAKA,EAAE,MAAM,CAAC;YAAEN;QAAM;IACzD,IAAIK,AAAkB,MAAlBA,OAAO,MAAM,EAIb,MAAM,IAAIE,YACN,2DACA;IAGR,MAAMC,SAASH,MAAM,CAACA,OAAO,MAAM,GAAG,EAAE;IAExC,MAAMN,OAAO,OAAO,CAAC,MAAM,CAAC;QACxBG;QACA,MAAM;YACF,GAAGM,OAAO,IAAI;QAClB;IACJ;AACJ"}
+{"version":3,"file":"utils/createIndex.js","sources":["../../src/utils/createIndex.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { StorageCmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { getOpenSearchIndexPrefix } from \"@webiny/api-opensearch\";\n\nexport interface ICreateIndexParams {\n    client: Client;\n    model: StorageCmsModel;\n    indexProvider: CmsModelOpenSearchIndexProvider.Interface;\n}\n\nexport const createIndex = async (params: ICreateIndexParams): Promise<void> => {\n    const { client, model, indexProvider } = params;\n\n    const { index: rawIndex, settings } = await indexProvider.execute({ model });\n\n    const prefix = getOpenSearchIndexPrefix();\n    const index = prefix ? prefix + rawIndex : rawIndex;\n\n    const result = await client.indices.exists({\n        index\n    });\n    if (result.body) {\n        return;\n    }\n\n    await client.indices.create({\n        index,\n        body: {\n            ...settings\n        }\n    });\n};\n"],"names":["createIndex","params","client","model","indexProvider","rawIndex","settings","prefix","getOpenSearchIndexPrefix","index","result"],"mappings":";AAWO,MAAMA,cAAc,OAAOC;IAC9B,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,aAAa,EAAE,GAAGH;IAEzC,MAAM,EAAE,OAAOI,QAAQ,EAAEC,QAAQ,EAAE,GAAG,MAAMF,cAAc,OAAO,CAAC;QAAED;IAAM;IAE1E,MAAMI,SAASC;IACf,MAAMC,QAAQF,SAASA,SAASF,WAAWA;IAE3C,MAAMK,SAAS,MAAMR,OAAO,OAAO,CAAC,MAAM,CAAC;QACvCO;IACJ;IACA,IAAIC,OAAO,IAAI,EACX;IAGJ,MAAMR,OAAO,OAAO,CAAC,MAAM,CAAC;QACxBO;QACA,MAAM;YACF,GAAGH,QAAQ;QACf;IACJ;AACJ"}

package/utils/disableIndexing.d.ts

@@ -1,7 +1,9 @@
 import type { Client } from "@webiny/api-opensearch";
-import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { StorageCmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 export interface IDisableIndexingParams {
     client: Client;
-    model: Pick<CmsModel, "modelId" | "tenant">;
+    model: StorageCmsModel;
+    indexProvider: CmsModelOpenSearchIndexProvider.Interface;
 }
 export declare const disableIndexing: (params: IDisableIndexingParams) => Promise<void>;

package/utils/disableIndexing.js

@@ -1,9 +1,11 @@
-import { configurations } from "@webiny/api-headless-cms-utils-os/configurations.js";
+import { getOpenSearchIndexPrefix } from "@webiny/api-opensearch";
 const disableIndexing = async (params)=>{
-    const { client, model } = params;
-    const { index } = configurations.es({
+    const { client, model, indexProvider } = params;
+    const { index: rawIndex } = await indexProvider.execute({
         model
     });
+    const prefix = getOpenSearchIndexPrefix();
+    const index = prefix ? prefix + rawIndex : rawIndex;
     try {
         await client.indices.putSettings({
             index,

package/utils/disableIndexing.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils/disableIndexing.js","sources":["../../src/utils/disableIndexing.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport { configurations } from \"@webiny/api-headless-cms-utils-os/configurations.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nexport interface IDisableIndexingParams {\n    client: Client;\n    model: Pick<CmsModel, \"modelId\" | \"tenant\">;\n}\n\nexport const disableIndexing = async (params: IDisableIndexingParams) => {\n    const { client, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n\n    try {\n        await client.indices.putSettings({\n            index,\n            body: {\n                index: {\n                    number_of_replicas: 0,\n                    refresh_interval: \"-1\"\n                }\n            }\n        });\n    } catch (ex) {\n        console.error(ex);\n        throw ex;\n    }\n};\n"],"names":["disableIndexing","params","client","model","index","configurations","ex","console"],"mappings":";AASO,MAAMA,kBAAkB,OAAOC;IAClC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGF;IAE1B,MAAM,EAAEG,KAAK,EAAE,GAAGC,eAAe,EAAE,CAAC;QAChCF;IACJ;IAEA,IAAI;QACA,MAAMD,OAAO,OAAO,CAAC,WAAW,CAAC;YAC7BE;YACA,MAAM;gBACF,OAAO;oBACH,oBAAoB;oBACpB,kBAAkB;gBACtB;YACJ;QACJ;IACJ,EAAE,OAAOE,IAAI;QACTC,QAAQ,KAAK,CAACD;QACd,MAAMA;IACV;AACJ"}
+{"version":3,"file":"utils/disableIndexing.js","sources":["../../src/utils/disableIndexing.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { StorageCmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { getOpenSearchIndexPrefix } from \"@webiny/api-opensearch\";\n\nexport interface IDisableIndexingParams {\n    client: Client;\n    model: StorageCmsModel;\n    indexProvider: CmsModelOpenSearchIndexProvider.Interface;\n}\n\nexport const disableIndexing = async (params: IDisableIndexingParams) => {\n    const { client, model, indexProvider } = params;\n\n    const { index: rawIndex } = await indexProvider.execute({ model });\n    const prefix = getOpenSearchIndexPrefix();\n    const index = prefix ? prefix + rawIndex : rawIndex;\n\n    try {\n        await client.indices.putSettings({\n            index,\n            body: {\n                index: {\n                    number_of_replicas: 0,\n                    refresh_interval: \"-1\"\n                }\n            }\n        });\n    } catch (ex) {\n        console.error(ex);\n        throw ex;\n    }\n};\n"],"names":["disableIndexing","params","client","model","indexProvider","rawIndex","prefix","getOpenSearchIndexPrefix","index","ex","console"],"mappings":";AAWO,MAAMA,kBAAkB,OAAOC;IAClC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,aAAa,EAAE,GAAGH;IAEzC,MAAM,EAAE,OAAOI,QAAQ,EAAE,GAAG,MAAMD,cAAc,OAAO,CAAC;QAAED;IAAM;IAChE,MAAMG,SAASC;IACf,MAAMC,QAAQF,SAASA,SAASD,WAAWA;IAE3C,IAAI;QACA,MAAMH,OAAO,OAAO,CAAC,WAAW,CAAC;YAC7BM;YACA,MAAM;gBACF,OAAO;oBACH,oBAAoB;oBACpB,kBAAkB;gBACtB;YACJ;QACJ;IACJ,EAAE,OAAOC,IAAI;QACTC,QAAQ,KAAK,CAACD;QACd,MAAMA;IACV;AACJ"}

package/utils/enableIndexing.d.ts

@@ -1,8 +1,10 @@
 import type { Client } from "@webiny/api-opensearch";
-import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { StorageCmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js";
 interface IEnableIndexingParams {
     client: Client;
-    model: Pick<CmsModel, "modelId" | "tenant">;
+    model: StorageCmsModel;
+    indexProvider: CmsModelOpenSearchIndexProvider.Interface;
 }
 export declare const enableIndexing: (params: IEnableIndexingParams) => Promise<void>;
 export {};

package/utils/enableIndexing.js

@@ -1,9 +1,11 @@
-import { configurations } from "@webiny/api-headless-cms-utils-os/configurations.js";
+import { getOpenSearchIndexPrefix } from "@webiny/api-opensearch";
 const enableIndexing = async (params)=>{
-    const { client, model } = params;
-    const { index } = configurations.es({
+    const { client, model, indexProvider } = params;
+    const { index: rawIndex } = await indexProvider.execute({
         model
     });
+    const prefix = getOpenSearchIndexPrefix();
+    const index = prefix ? prefix + rawIndex : rawIndex;
     try {
         await client.indices.putSettings({
             index,

package/utils/enableIndexing.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils/enableIndexing.js","sources":["../../src/utils/enableIndexing.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { configurations } from \"@webiny/api-headless-cms-utils-os/configurations.js\";\n\ninterface IEnableIndexingParams {\n    client: Client;\n    model: Pick<CmsModel, \"modelId\" | \"tenant\">;\n}\n\nexport const enableIndexing = async (params: IEnableIndexingParams) => {\n    const { client, model } = params;\n    const { index } = configurations.es({\n        model\n    });\n    try {\n        await client.indices.putSettings({\n            index,\n            body: {\n                index: {\n                    number_of_replicas: 1,\n                    refresh_interval: \"1s\"\n                }\n            }\n        });\n    } catch (ex) {\n        console.error(ex);\n        throw ex;\n    }\n};\n"],"names":["enableIndexing","params","client","model","index","configurations","ex","console"],"mappings":";AASO,MAAMA,iBAAiB,OAAOC;IACjC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGF;IAC1B,MAAM,EAAEG,KAAK,EAAE,GAAGC,eAAe,EAAE,CAAC;QAChCF;IACJ;IACA,IAAI;QACA,MAAMD,OAAO,OAAO,CAAC,WAAW,CAAC;YAC7BE;YACA,MAAM;gBACF,OAAO;oBACH,oBAAoB;oBACpB,kBAAkB;gBACtB;YACJ;QACJ;IACJ,EAAE,OAAOE,IAAI;QACTC,QAAQ,KAAK,CAACD;QACd,MAAMA;IACV;AACJ"}
+{"version":3,"file":"utils/enableIndexing.js","sources":["../../src/utils/enableIndexing.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { StorageCmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-utils-os/exports/api/cms/opensearch.js\";\nimport { getOpenSearchIndexPrefix } from \"@webiny/api-opensearch\";\n\ninterface IEnableIndexingParams {\n    client: Client;\n    model: StorageCmsModel;\n    indexProvider: CmsModelOpenSearchIndexProvider.Interface;\n}\n\nexport const enableIndexing = async (params: IEnableIndexingParams) => {\n    const { client, model, indexProvider } = params;\n    const { index: rawIndex } = await indexProvider.execute({ model });\n    const prefix = getOpenSearchIndexPrefix();\n    const index = prefix ? prefix + rawIndex : rawIndex;\n    try {\n        await client.indices.putSettings({\n            index,\n            body: {\n                index: {\n                    number_of_replicas: 1,\n                    refresh_interval: \"1s\"\n                }\n            }\n        });\n    } catch (ex) {\n        console.error(ex);\n        throw ex;\n    }\n};\n"],"names":["enableIndexing","params","client","model","indexProvider","rawIndex","prefix","getOpenSearchIndexPrefix","index","ex","console"],"mappings":";AAWO,MAAMA,iBAAiB,OAAOC;IACjC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,aAAa,EAAE,GAAGH;IACzC,MAAM,EAAE,OAAOI,QAAQ,EAAE,GAAG,MAAMD,cAAc,OAAO,CAAC;QAAED;IAAM;IAChE,MAAMG,SAASC;IACf,MAAMC,QAAQF,SAASA,SAASD,WAAWA;IAC3C,IAAI;QACA,MAAMH,OAAO,OAAO,CAAC,WAAW,CAAC;YAC7BM;YACA,MAAM;gBACF,OAAO;oBACH,oBAAoB;oBACpB,kBAAkB;gBACtB;YACJ;QACJ;IACJ,EAAE,OAAOC,IAAI;QACTC,QAAQ,KAAK,CAACD;QACd,MAAMA;IACV;AACJ"}