@webiny/api-headless-cms-es-tasks 6.4.4-beta.6 → 6.4.4-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-es-tasks",
-	"version": "6.4.4-beta.6",
+	"version": "6.4.4-beta.8",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,23 +17,22 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-core": "6.4.4-beta.6",
-		"@webiny/api-headless-cms": "6.4.4-beta.6",
-		"@webiny/api-headless-cms-ddb-es": "6.4.4-beta.6",
-		"@webiny/api-opensearch": "6.4.4-beta.6",
-		"@webiny/background-tasks": "6.4.4-beta.6",
-		"@webiny/error": "6.4.4-beta.6",
-		"@webiny/handler": "6.4.4-beta.6",
-		"@webiny/handler-aws": "6.4.4-beta.6",
-		"@webiny/utils": "6.4.4-beta.6"
+		"@webiny/api-core": "6.4.4-beta.8",
+		"@webiny/api-headless-cms": "6.4.4-beta.8",
+		"@webiny/api-headless-cms-ddb-es": "6.4.4-beta.8",
+		"@webiny/api-opensearch": "6.4.4-beta.8",
+		"@webiny/background-tasks": "6.4.4-beta.8",
+		"@webiny/handler": "6.4.4-beta.8",
+		"@webiny/handler-aws": "6.4.4-beta.8",
+		"@webiny/utils": "6.4.4-beta.8"
 	},
 	"devDependencies": {
-		"@webiny/api": "6.4.4-beta.6",
-		"@webiny/build-tools": "6.4.4-beta.6",
-		"@webiny/handler-graphql": "6.4.4-beta.6",
-		"@webiny/plugins": "6.4.4-beta.6",
-		"@webiny/project-utils": "6.4.4-beta.6",
-		"@webiny/wcp": "6.4.4-beta.6",
+		"@webiny/api": "6.4.4-beta.8",
+		"@webiny/build-tools": "6.4.4-beta.8",
+		"@webiny/handler-graphql": "6.4.4-beta.8",
+		"@webiny/plugins": "6.4.4-beta.8",
+		"@webiny/project-utils": "6.4.4-beta.8",
+		"@webiny/wcp": "6.4.4-beta.8",
 		"typescript": "6.0.3",
 		"vitest": "4.1.10"
 	},

package/tasks/MockDataManager/MockDataManager.js

@@ -3,6 +3,7 @@ import { calculateAmounts } from "./calculateAmounts.js";
 import { WAIT_MAX_SECONDS, calculateSeconds } from "./calculateSeconds.js";
 import { createModelAndGroup } from "./createModelAndGroup.js";
 import { disableIndexing, enableIndexing } from "../../utils/index.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.js";
 import { MOCK_DATA_CREATOR_TASK_ID } from "../MockDataCreatorTask.js";
 class MockDataManager {
     constructor(context){
@@ -22,12 +23,11 @@ class MockDataManager {
             }, {
                 seconds: input.seconds || WAIT_MAX_SECONDS
             });
-            await enableIndexing({
+            const model = (await this.context.cms.listModels()).find((m)=>m.modelId === input.modelId);
+            if (model) await enableIndexing({
                 client: this.context.opensearch,
-                model: {
-                    modelId: input.modelId,
-                    tenant: "root"
-                }
+                model,
+                indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)
             });
             return controller.response.done();
         }
@@ -39,7 +39,8 @@ class MockDataManager {
         if ("string" == typeof result) return controller.response.done(result);
         await disableIndexing({
             model: result.model,
-            client: this.context.opensearch
+            client: this.context.opensearch,
+            indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)
         });
         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 } 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\";\n\nexport class MockDataManager<I extends IMockDataManagerInput, O extends IMockDataManagerOutput> {\n    constructor(private context: Context) {}\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.context.opensearch,\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.context.opensearch\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.tasks.listTasks({\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.tasks.abort({\n                id: item.id,\n                message: \"Aborted by parent task.\"\n            });\n        }\n    }\n}\n"],"names":["MockDataManager","context","params","input","controller","taskId","items","WAIT_MAX_SECONDS","enableIndexing","result","createModelAndGroup","disableIndexing","amountOfTasks","amountOfRecords","calculateAmounts","seconds","calculateSeconds","current","MOCK_DATA_CREATOR_TASK_ID","id","TaskDataStatus","item"],"mappings":";;;;;;AAeO,MAAMA;IACT,YAAoBC,OAAgB,CAAE;aAAlBA,OAAO,GAAPA;IAAmB;IAEvC,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,OAAO,CAAC,UAAU;gBAC/B,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,OAAO,CAAC,UAAU;QACnC;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,sBAAsBd,OAAgB,EAAEkB,EAAU,EAA+B;QAC3F,MAAM,EAAEb,KAAK,EAAE,GAAG,MAAML,QAAQ,KAAK,CAAC,SAAS,CAAC;YAC5C,OAAO;gBACH,UAAUkB;gBACV,eAAe;oBAACC,eAAe,OAAO;oBAAEA,eAAe,OAAO;iBAAC;YACnE;YACA,OAAO;QACX;QACA,OAAOd;IACX;IAEA,MAAc,gBAAgBL,OAAgB,EAAEkB,EAAU,EAAiB;QACvE,MAAMb,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAACL,SAASkB;QACxD,KAAK,MAAME,QAAQf,MACf,MAAML,QAAQ,KAAK,CAAC,KAAK,CAAC;YACtB,IAAIoB,KAAK,EAAE;YACX,SAAS;QACb;IAER;AACJ"}
+{"version":3,"file":"tasks/MockDataManager/MockDataManager.js","sources":["../../../src/tasks/MockDataManager/MockDataManager.ts"],"sourcesContent":["import { TaskDataStatus } 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 { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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\";\n\nexport class MockDataManager<I extends IMockDataManagerInput, O extends IMockDataManagerOutput> {\n    constructor(private context: Context) {}\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            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            const model = (await this.context.cms.listModels()).find(\n                m => m.modelId === input.modelId\n            );\n            if (model) {\n                await enableIndexing({\n                    client: this.context.opensearch,\n                    model,\n                    indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)\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.context.opensearch,\n            indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)\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.tasks.listTasks({\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.tasks.abort({\n                id: item.id,\n                message: \"Aborted by parent task.\"\n            });\n        }\n    }\n}\n"],"names":["MockDataManager","context","params","input","controller","taskId","items","WAIT_MAX_SECONDS","model","m","enableIndexing","CmsModelOpenSearchIndexProvider","result","createModelAndGroup","disableIndexing","amountOfTasks","amountOfRecords","calculateAmounts","seconds","calculateSeconds","current","MOCK_DATA_CREATOR_TASK_ID","id","TaskDataStatus","item"],"mappings":";;;;;;;AAgBO,MAAMA;IACT,YAAoBC,OAAgB,CAAE;aAAlBA,OAAO,GAAPA;IAAmB;IAEvC,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;YAE7D,IAAIC,MAAM,MAAM,GAAG,GACf,OAAOF,WAAW,QAAQ,CAAC,QAAQ,CAC/B;gBACI,GAAGD,KAAK;YACZ,GACA;gBACI,SAASA,MAAM,OAAO,IAAII;YAC9B;YAIR,MAAMC,QAAS,OAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CACpDC,CAAAA,IAAKA,EAAE,OAAO,KAAKN,MAAM,OAAO;YAEpC,IAAIK,OACA,MAAME,eAAe;gBACjB,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU;gBAC/BF;gBACA,eAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAACG;YAClD;YAEJ,OAAOP,WAAW,QAAQ,CAAC,IAAI;QACnC;QAEA,MAAMQ,SAAS,MAAMC,oBAAoB;YACrC,SAAS,IAAI,CAAC,OAAO;YACrB,SAASV,MAAM,OAAO;YACtB,WAAWA,MAAM,SAAS;QAC9B;QACA,IAAI,AAAkB,YAAlB,OAAOS,QACP,OAAOR,WAAW,QAAQ,CAAC,IAAI,CAACQ;QAGpC,MAAME,gBAAgB;YAClB,OAAOF,OAAO,KAAK;YACnB,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,eAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAACD;QAClD;QAEA,MAAM,EAAEI,aAAa,EAAEC,eAAe,EAAE,GAAGC,iBAAiBd,MAAM,MAAM;QAExE,MAAMe,UAAUC,iBAAiBH;QAEjC,IAAK,IAAII,UAAU,GAAGA,UAAUL,eAAeK,UAC3C,MAAMhB,WAAW,IAAI,CAAC,OAAO,CAAwB;YACjD,YAAYiB;YACZ,OAAO;gBACH,aAAaL;gBACb,eAAe;YACnB;YACA,MAAM,CAAC,wBAAwB,EAAEI,UAAU,EAAE,IAAI,EAAEL,eAAe;QACtE;QAGJ,OAAOX,WAAW,QAAQ,CAAC,QAAQ,CAC/B;YACI,GAAGD,KAAK;YACRe;YACAH;YACAC;QACJ,GACA;YACIE;QACJ;IAER;IAEA,MAAc,sBAAsBjB,OAAgB,EAAEqB,EAAU,EAA+B;QAC3F,MAAM,EAAEhB,KAAK,EAAE,GAAG,MAAML,QAAQ,KAAK,CAAC,SAAS,CAAC;YAC5C,OAAO;gBACH,UAAUqB;gBACV,eAAe;oBAACC,eAAe,OAAO;oBAAEA,eAAe,OAAO;iBAAC;YACnE;YACA,OAAO;QACX;QACA,OAAOjB;IACX;IAEA,MAAc,gBAAgBL,OAAgB,EAAEqB,EAAU,EAAiB;QACvE,MAAMhB,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAACL,SAASqB;QACxD,KAAK,MAAME,QAAQlB,MACf,MAAML,QAAQ,KAAK,CAAC,KAAK,CAAC;YACtB,IAAIuB,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-ddb-es/exports/api/cms/opensearch.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.js";
 const createModelAndGroup = async (params)=>{
     const { context, modelId, overwrite = false } = params;
     let model = (await context.cms.listModels()).find((m)=>m.modelId === modelId);
@@ -19,7 +19,7 @@ const createModelAndGroup = async (params)=>{
     await createIndex({
         model,
         client: context.opensearch,
-        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-ddb-es/exports/api/cms/opensearch.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    let model = (await context.cms.listModels()).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        group = (await context.cms.listGroups()).find(group => group.slug === \"mocks\");\n        if (!group) {\n            const groupData = createGroupData();\n            group = await context.cms.createGroup(groupData);\n        }\n        /**\n         * Possibly we need to create the model.\n         */\n        const carsModel = createCarsModel(group);\n        model = await context.cms.createModel(carsModel);\n    }\n    await createIndex({\n        model,\n        client: context.opensearch,\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","model","m","group","groupData","createGroupData","carsModel","createCarsModel","createIndex","CmsEntryOpenSearchIndex"],"mappings":";;;;AAkBO,MAAMA,sBAAsB,OAC/BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,YAAY,KAAK,EAAE,GAAGH;IAIhD,IAAII,QAAS,OAAMH,QAAQ,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CAACI,CAAAA,IAAKA,EAAE,OAAO,KAAKH;IACrE,IAAII;IACJ,IAAIF,SAAS,CAACD,WACV,OAAO,CAAC,OAAO,EAAED,QAAQ,iBAAiB,CAAC;IACxC,IAAI,CAACE,OAAO;QACfE,QAAS,OAAML,QAAQ,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CAACK,CAAAA,QAASA,AAAe,YAAfA,MAAM,IAAI;QACjE,IAAI,CAACA,OAAO;YACR,MAAMC,YAAYC;YAClBF,QAAQ,MAAML,QAAQ,GAAG,CAAC,WAAW,CAACM;QAC1C;QAIA,MAAME,YAAYC,gBAAgBJ;QAClCF,QAAQ,MAAMH,QAAQ,GAAG,CAAC,WAAW,CAACQ;IAC1C;IACA,MAAME,YAAY;QACdP;QACA,QAAQH,QAAQ,UAAU;QAC1B,cAAcA,QAAQ,SAAS,CAAC,UAAU,CAACW;IAC/C;IAEA,OAAO;QACH,OAAON;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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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    let model = (await context.cms.listModels()).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        group = (await context.cms.listGroups()).find(group => group.slug === \"mocks\");\n        if (!group) {\n            const groupData = createGroupData();\n            group = await context.cms.createGroup(groupData);\n        }\n        /**\n         * Possibly we need to create the model.\n         */\n        const carsModel = createCarsModel(group);\n        model = await context.cms.createModel(carsModel);\n    }\n    await createIndex({\n        model,\n        client: context.opensearch,\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","model","m","group","groupData","createGroupData","carsModel","createCarsModel","createIndex","CmsModelOpenSearchIndexProvider"],"mappings":";;;;AAkBO,MAAMA,sBAAsB,OAC/BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAEC,YAAY,KAAK,EAAE,GAAGH;IAIhD,IAAII,QAAS,OAAMH,QAAQ,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CAACI,CAAAA,IAAKA,EAAE,OAAO,KAAKH;IACrE,IAAII;IACJ,IAAIF,SAAS,CAACD,WACV,OAAO,CAAC,OAAO,EAAED,QAAQ,iBAAiB,CAAC;IACxC,IAAI,CAACE,OAAO;QACfE,QAAS,OAAML,QAAQ,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CAACK,CAAAA,QAASA,AAAe,YAAfA,MAAM,IAAI;QACjE,IAAI,CAACA,OAAO;YACR,MAAMC,YAAYC;YAClBF,QAAQ,MAAML,QAAQ,GAAG,CAAC,WAAW,CAACM;QAC1C;QAIA,MAAME,YAAYC,gBAAgBJ;QAClCF,QAAQ,MAAMH,QAAQ,GAAG,CAAC,WAAW,CAACQ;IAC1C;IACA,MAAME,YAAY;QACdP;QACA,QAAQH,QAAQ,UAAU;QAC1B,eAAeA,QAAQ,SAAS,CAAC,OAAO,CAACW;IAC7C;IAEA,OAAO;QACH,OAAON;QACP,OAAOF;IACX;AACJ"}

package/tasks/MockDataManagerTask.d.ts

@@ -10,6 +10,7 @@ declare class MockDataManagerTask implements TaskDefinition.Interface<IMockDataM
     private readonly context;
     constructor(context: CmsContext.Interface);
     run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>): Promise<TaskDefinition.Result<IMockDataManagerInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions.js").ITaskOutput>>;
+    private findModel;
     onError(): Promise<void>;
     onAbort(): Promise<void>;
 }

package/tasks/MockDataManagerTask.js

@@ -1,5 +1,6 @@
 import { CARS_MODEL_ID } from "./MockDataManager/constants.js";
 import { enableIndexing } from "../utils/index.js";
+import { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.js";
 import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
 import { CmsContext } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 const MOCK_DATA_MANAGER_TASK_ID = "mockDataManager";
@@ -26,22 +27,23 @@ class MockDataManagerTask {
             return params.controller.response.error(ex);
         }
     }
+    async findModel() {
+        return (await this.context.cms.listModels()).find((m)=>m.modelId === CARS_MODEL_ID);
+    }
     async onError() {
-        await enableIndexing({
+        const model = await this.findModel();
+        if (model) await enableIndexing({
             client: this.context.opensearch,
-            model: {
-                modelId: CARS_MODEL_ID,
-                tenant: "root"
-            }
+            model,
+            indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)
         });
     }
     async onAbort() {
-        await enableIndexing({
+        const model = await this.findModel();
+        if (model) await enableIndexing({
             client: this.context.opensearch,
-            model: {
-                modelId: CARS_MODEL_ID,
-                tenant: "root"
-            }
+            model,
+            indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)
         });
     }
 }

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\";\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    private readonly context: Context;\n\n    constructor(context: CmsContext.Interface) {\n        this.context = context as Context;\n    }\n\n    async run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>) {\n        const { MockDataManager } = await import(\n            /* webpackChunkName: \"MockDataManager\" */ \"./MockDataManager/MockDataManager.js\"\n        );\n\n        const carsMock = new MockDataManager<IMockDataManagerInput, IMockDataManagerOutput>(\n            this.context as Context\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.context.opensearch,\n            model: {\n                modelId: CARS_MODEL_ID,\n                tenant: \"root\"\n            }\n        });\n    }\n\n    async onAbort() {\n        await enableIndexing({\n            client: this.context.opensearch,\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]\n});\n"],"names":["MOCK_DATA_MANAGER_TASK_ID","MockDataManagerTask","context","params","MockDataManager","carsMock","CARS_MODEL_ID","ex","enableIndexing","MockDataManagerTaskDefinition","TaskDefinition","CmsContext"],"mappings":";;;;AAUO,MAAMA,4BAA4B;AAEzC,MAAMC;IAYF,YAAYC,OAA6B,CAAE;aAR3C,EAAE,GAAGF;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAEhB,WAAW,GAAG;QAKV,IAAI,CAAC,OAAO,GAAGE;IACnB;IAEA,MAAM,IAAIC,MAA+E,EAAE;QACvF,MAAM,EAAEC,eAAe,EAAE,GAAG,MAAM,MAAM,CAAN;QAIlC,MAAMC,WAAW,IAAID,gBACjB,IAAI,CAAC,OAAO;QAGhB,IAAI;YACA,OAAO,MAAMC,SAAS,OAAO,CAAC;gBAC1B,GAAGF,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,OAAO,CAAC,UAAU;YAC/B,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;QACJ;IACJ;IAEA,MAAM,UAAU;QACZ,MAAME,eAAe;YACjB,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO;gBACH,SAASF;gBACT,QAAQ;YACZ;QACJ;IACJ;AACJ;AAEO,MAAMG,gCAAgCC,eAAe,oBAAoB,CAAC;IAC7E,gBAAgBT;IAChB,cAAc;QAACU;KAAW;AAC9B"}
+{"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 { CmsModelOpenSearchIndexProvider } from \"@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.js\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { CmsContext } from \"@webiny/api-headless-cms/features/shared/abstractions.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    private readonly context: Context;\n\n    constructor(context: CmsContext.Interface) {\n        this.context = context as Context;\n    }\n\n    async run(params: TaskDefinition.RunParams<IMockDataManagerInput, IMockDataManagerOutput>) {\n        const { MockDataManager } = await import(\n            /* webpackChunkName: \"MockDataManager\" */ \"./MockDataManager/MockDataManager.js\"\n        );\n\n        const carsMock = new MockDataManager<IMockDataManagerInput, IMockDataManagerOutput>(\n            this.context as Context\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\n    private async findModel() {\n        return (await this.context.cms.listModels()).find(m => m.modelId === CARS_MODEL_ID);\n    }\n\n    async onError() {\n        const model = await this.findModel();\n        if (model) {\n            await enableIndexing({\n                client: this.context.opensearch,\n                model,\n                indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)\n            });\n        }\n    }\n\n    async onAbort() {\n        const model = await this.findModel();\n        if (model) {\n            await enableIndexing({\n                client: this.context.opensearch,\n                model,\n                indexProvider: this.context.container.resolve(CmsModelOpenSearchIndexProvider)\n            });\n        }\n    }\n}\n\nexport const MockDataManagerTaskDefinition = TaskDefinition.createImplementation({\n    implementation: MockDataManagerTask,\n    dependencies: [CmsContext]\n});\n"],"names":["MOCK_DATA_MANAGER_TASK_ID","MockDataManagerTask","context","params","MockDataManager","carsMock","CARS_MODEL_ID","ex","m","model","enableIndexing","CmsModelOpenSearchIndexProvider","MockDataManagerTaskDefinition","TaskDefinition","CmsContext"],"mappings":";;;;;AAWO,MAAMA,4BAA4B;AAEzC,MAAMC;IAYF,YAAYC,OAA6B,CAAE;aAR3C,EAAE,GAAGF;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAEhB,WAAW,GAAG;QAKV,IAAI,CAAC,OAAO,GAAGE;IACnB;IAEA,MAAM,IAAIC,MAA+E,EAAE;QACvF,MAAM,EAAEC,eAAe,EAAE,GAAG,MAAM,MAAM,CAAN;QAIlC,MAAMC,WAAW,IAAID,gBACjB,IAAI,CAAC,OAAO;QAGhB,IAAI;YACA,OAAO,MAAMC,SAAS,OAAO,CAAC;gBAC1B,GAAGF,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;IAEA,MAAc,YAAY;QACtB,OAAQ,OAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAC,EAAG,IAAI,CAACC,CAAAA,IAAKA,EAAE,OAAO,KAAKF;IACzE;IAEA,MAAM,UAAU;QACZ,MAAMG,QAAQ,MAAM,IAAI,CAAC,SAAS;QAClC,IAAIA,OACA,MAAMC,eAAe;YACjB,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/BD;YACA,eAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAACE;QAClD;IAER;IAEA,MAAM,UAAU;QACZ,MAAMF,QAAQ,MAAM,IAAI,CAAC,SAAS;QAClC,IAAIA,OACA,MAAMC,eAAe;YACjB,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/BD;YACA,eAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAACE;QAClD;IAER;AACJ;AAEO,MAAMC,gCAAgCC,eAAe,oBAAoB,CAAC;IAC7E,gBAAgBZ;IAChB,cAAc;QAACa;KAAW;AAC9B"}

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-ddb-es/exports/api/cms/opensearch.js";
+import type { StorageCmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModelOpenSearchIndexProvider } from "@webiny/api-headless-cms-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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-ddb-es/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-ddb-es/configurations.js\";\nimport type { CmsEntryOpenSearchIndex } from \"@webiny/api-headless-cms-ddb-es/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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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-ddb-es/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-ddb-es/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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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-ddb-es/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-ddb-es/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-ddb-es/features/CmsModelOpenSearchIndex/CmsModelOpenSearchIndexProvider.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"}