@webiny/api-form-builder-so-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.40876133bb

package/index.js

@@ -1,18 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormBuilderStorageOperations = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _types = require("./types");
+var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
+
+var _elasticsearchFields = _interopRequireDefault(require("./operations/form/elasticsearchFields"));
+
+var _elasticsearchFields2 = _interopRequireDefault(require("./operations/submission/elasticsearchFields"));
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
+var _types = require("./types");
+
 var _table = require("./definitions/table");
 
 var _form = require("./definitions/form");
@@ -31,27 +37,17 @@ var _settings2 = require("./operations/settings");
 
 var _form2 = require("./operations/form");
 
-var _createElasticsearchIndex = require("./operations/system/createElasticsearchIndex");
-
 var _tableElasticsearch = require("./definitions/tableElasticsearch");
 
 var _plugins = require("@webiny/plugins");
 
 var _elasticsearch = require("./definitions/elasticsearch");
 
-var _elasticsearchFields = _interopRequireDefault(require("./operations/submission/elasticsearchFields"));
-
-var _elasticsearchFields2 = _interopRequireDefault(require("./operations/form/elasticsearchFields"));
-
-var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
-
-var _operators = require("@webiny/api-elasticsearch/operators");
-
-var _ = _interopRequireDefault(require("./upgrades/5.16.0"));
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _indices = require("./elasticsearch/indices");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
 
 const reservedFields = ["PK", "SK", "index", "data", "TYPE", "__type", "GSI1_PK", "GSI1_SK"];
 
@@ -67,12 +63,12 @@ const isReserved = name => {
 
 const createFormBuilderStorageOperations = params => {
   const {
-    attributes = {},
+    attributes,
     table: tableName,
     esTable: esTableName,
     documentClient,
     elasticsearch,
-    plugins: pluginsInput
+    plugins: userPlugins
   } = params;
 
   if (attributes) {
@@ -85,15 +81,15 @@ const createFormBuilderStorageOperations = params => {
   /**
    * User defined plugins.
    */
-  pluginsInput || [],
+  userPlugins || [],
   /**
    * Elasticsearch field definitions for the submission record.
    */
-  (0, _elasticsearchFields.default)(),
+  (0, _elasticsearchFields2.default)(),
   /**
    * Elasticsearch field definitions for the form record.
    */
-  (0, _elasticsearchFields2.default)(),
+  (0, _elasticsearchFields.default)(),
   /**
    * DynamoDB filter plugins for the where conditions.
    */
@@ -101,7 +97,11 @@ const createFormBuilderStorageOperations = params => {
   /**
    * Elasticsearch operators.
    */
-  (0, _operators.getElasticsearchOperators)()]);
+  (0, _apiElasticsearch.getElasticsearchOperators)(),
+  /**
+   * Built-in Elasticsearch index plugins
+   */
+  (0, _indices.elasticsearchIndexPlugins)()]);
   const table = (0, _table.createTable)({
     tableName,
     documentClient
@@ -117,22 +117,22 @@ const createFormBuilderStorageOperations = params => {
     form: (0, _form.createFormEntity)({
       entityName: _types.ENTITIES.FORM,
       table,
-      attributes: attributes[_types.ENTITIES.FORM]
+      attributes: attributes ? attributes[_types.ENTITIES.FORM] : {}
     }),
     submission: (0, _submission.createSubmissionEntity)({
       entityName: _types.ENTITIES.SUBMISSION,
       table,
-      attributes: attributes[_types.ENTITIES.SUBMISSION]
+      attributes: attributes ? attributes[_types.ENTITIES.SUBMISSION] : {}
     }),
     system: (0, _system.createSystemEntity)({
       entityName: _types.ENTITIES.SYSTEM,
       table,
-      attributes: attributes[_types.ENTITIES.SYSTEM]
+      attributes: attributes ? attributes[_types.ENTITIES.SYSTEM] : {}
     }),
     settings: (0, _settings.createSettingsEntity)({
       entityName: _types.ENTITIES.SETTINGS,
       table,
-      attributes: attributes[_types.ENTITIES.SETTINGS]
+      attributes: attributes ? attributes[_types.ENTITIES.SETTINGS] : {}
     }),
 
     /**
@@ -141,26 +141,29 @@ const createFormBuilderStorageOperations = params => {
     esForm: (0, _elasticsearch.createElasticsearchEntity)({
       entityName: _types.ENTITIES.ES_FORM,
       table: esTable,
-      attributes: attributes[_types.ENTITIES.ES_FORM]
+      attributes: attributes ? attributes[_types.ENTITIES.ES_FORM] : {}
     }),
     esSubmission: (0, _elasticsearch.createElasticsearchEntity)({
       entityName: _types.ENTITIES.ES_SUBMISSION,
       table: esTable,
-      attributes: attributes[_types.ENTITIES.ES_SUBMISSION]
+      attributes: attributes ? attributes[_types.ENTITIES.ES_SUBMISSION] : {}
     })
   };
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    init: async formBuilder => {
-      formBuilder.onAfterInstall.subscribe(async ({
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    init: async context => {
+      context.i18n.locales.onLocaleBeforeCreate.subscribe(async ({
+        locale,
         tenant
       }) => {
         await (0, _createElasticsearchIndex.createElasticsearchIndex)({
           elasticsearch,
-          tenant
+          plugins,
+          tenant,
+          locale: locale.code
         });
       });
     },
-    upgrade: (0, _.default)(),
+    upgrade: null,
     getTable: () => table,
     getEsTable: () => esTable,
     getEntities: () => entities

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["reservedFields","isReserved","name","includes","WebinyError","createFormBuilderStorageOperations","params","attributes","table","tableName","esTable","esTableName","documentClient","elasticsearch","plugins","userPlugins","Object","values","forEach","attrs","keys","PluginsContainer","submissionElasticsearchFields","formElasticsearchFields","dynamoDbValueFilters","getElasticsearchOperators","elasticsearchIndexPlugins","createTable","createElasticsearchTable","entities","form","createFormEntity","entityName","ENTITIES","FORM","submission","createSubmissionEntity","SUBMISSION","system","createSystemEntity","SYSTEM","settings","createSettingsEntity","SETTINGS","esForm","createElasticsearchEntity","ES_FORM","esSubmission","ES_SUBMISSION","init","context","i18n","locales","onLocaleBeforeCreate","subscribe","locale","tenant","createElasticsearchIndex","code","upgrade","getTable","getEsTable","getEntities","createSystemStorageOperations","entity","createSettingsStorageOperations","createFormStorageOperations","esEntity","createSubmissionStorageOperations"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport formElasticsearchFields from \"./operations/form/elasticsearchFields\";\nimport submissionElasticsearchFields from \"./operations/submission/elasticsearchFields\";\nimport WebinyError from \"@webiny/error\";\nimport { FormBuilderStorageOperationsFactory, ENTITIES } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createFormEntity } from \"~/definitions/form\";\nimport { createSubmissionEntity } from \"~/definitions/submission\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createSystemStorageOperations } from \"~/operations/system\";\nimport { createSubmissionStorageOperations } from \"~/operations/submission\";\nimport { createSettingsStorageOperations } from \"~/operations/settings\";\nimport { createFormStorageOperations } from \"~/operations/form\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createElasticsearchEntity } from \"~/definitions/elasticsearch\";\nimport { getElasticsearchOperators } from \"@webiny/api-elasticsearch\";\nimport { elasticsearchIndexPlugins } from \"~/elasticsearch/indices\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\n\nconst reservedFields = [\"PK\", \"SK\", \"index\", \"data\", \"TYPE\", \"__type\", \"GSI1_PK\", \"GSI1_SK\"];\n\nconst isReserved = (name: string): void => {\n    if (reservedFields.includes(name) === false) {\n        return;\n    }\n    throw new WebinyError(`Attribute name \"${name}\" is not allowed.`, \"ATTRIBUTE_NOT_ALLOWED\", {\n        name\n    });\n};\n\nexport const createFormBuilderStorageOperations: FormBuilderStorageOperationsFactory = params => {\n    const {\n        attributes,\n        table: tableName,\n        esTable: esTableName,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    if (attributes) {\n        Object.values(attributes).forEach(attrs => {\n            Object.keys(attrs).forEach(isReserved);\n        });\n    }\n\n    const plugins = new PluginsContainer([\n        /**\n         * User defined plugins.\n         */\n        userPlugins || [],\n        /**\n         * Elasticsearch field definitions for the submission record.\n         */\n        submissionElasticsearchFields(),\n        /**\n         * Elasticsearch field definitions for the form record.\n         */\n        formElasticsearchFields(),\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Built-in Elasticsearch index plugins\n         */\n        elasticsearchIndexPlugins()\n    ]);\n\n    const table = createTable({\n        tableName,\n        documentClient\n    });\n\n    const esTable = createElasticsearchTable({\n        tableName: esTableName,\n        documentClient\n    });\n\n    const entities = {\n        /**\n         * Regular entities.\n         */\n        form: createFormEntity({\n            entityName: ENTITIES.FORM,\n            table,\n            attributes: attributes ? attributes[ENTITIES.FORM] : {}\n        }),\n        submission: createSubmissionEntity({\n            entityName: ENTITIES.SUBMISSION,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SUBMISSION] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        /**\n         * Elasticsearch entities.\n         */\n        esForm: createElasticsearchEntity({\n            entityName: ENTITIES.ES_FORM,\n            table: esTable,\n            attributes: attributes ? attributes[ENTITIES.ES_FORM] : {}\n        }),\n        esSubmission: createElasticsearchEntity({\n            entityName: ENTITIES.ES_SUBMISSION,\n            table: esTable,\n            attributes: attributes ? attributes[ENTITIES.ES_SUBMISSION] : {}\n        })\n    };\n\n    return {\n        init: async context => {\n            context.i18n.locales.onLocaleBeforeCreate.subscribe(async ({ locale, tenant }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    plugins,\n                    tenant,\n                    locale: locale.code\n                });\n            });\n        },\n        upgrade: null,\n        getTable: () => table,\n        getEsTable: () => esTable,\n        getEntities: () => entities,\n        ...createSystemStorageOperations({\n            table,\n            entity: entities.system\n        }),\n        ...createSettingsStorageOperations({\n            table,\n            entity: entities.settings\n        }),\n        ...createFormStorageOperations({\n            elasticsearch,\n            table,\n            entity: entities.form,\n            esEntity: entities.esForm,\n            plugins\n        }),\n        ...createSubmissionStorageOperations({\n            elasticsearch,\n            table,\n            entity: entities.submission,\n            esEntity: entities.esSubmission,\n            plugins\n        })\n    };\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA,MAAMA,cAAc,GAAG,CAAC,IAAD,EAAO,IAAP,EAAa,OAAb,EAAsB,MAAtB,EAA8B,MAA9B,EAAsC,QAAtC,EAAgD,SAAhD,EAA2D,SAA3D,CAAvB;;AAEA,MAAMC,UAAU,GAAIC,IAAD,IAAwB;EACvC,IAAIF,cAAc,CAACG,QAAf,CAAwBD,IAAxB,MAAkC,KAAtC,EAA6C;IACzC;EACH;;EACD,MAAM,IAAIE,cAAJ,CAAiB,mBAAkBF,IAAK,mBAAxC,EAA4D,uBAA5D,EAAqF;IACvFA;EADuF,CAArF,CAAN;AAGH,CAPD;;AASO,MAAMG,kCAAuE,GAAGC,MAAM,IAAI;EAC7F,MAAM;IACFC,UADE;IAEFC,KAAK,EAAEC,SAFL;IAGFC,OAAO,EAAEC,WAHP;IAIFC,cAJE;IAKFC,aALE;IAMFC,OAAO,EAAEC;EANP,IAOFT,MAPJ;;EASA,IAAIC,UAAJ,EAAgB;IACZS,MAAM,CAACC,MAAP,CAAcV,UAAd,EAA0BW,OAA1B,CAAkCC,KAAK,IAAI;MACvCH,MAAM,CAACI,IAAP,CAAYD,KAAZ,EAAmBD,OAAnB,CAA2BjB,UAA3B;IACH,CAFD;EAGH;;EAED,MAAMa,OAAO,GAAG,IAAIO,yBAAJ,CAAqB;EACjC;AACR;AACA;EACQN,WAAW,IAAI,EAJkB;EAKjC;AACR;AACA;EACQ,IAAAO,6BAAA,GARiC;EASjC;AACR;AACA;EACQ,IAAAC,4BAAA,GAZiC;EAajC;AACR;AACA;EACQ,IAAAC,gBAAA,GAhBiC;EAiBjC;AACR;AACA;EACQ,IAAAC,2CAAA,GApBiC;EAqBjC;AACR;AACA;EACQ,IAAAC,kCAAA,GAxBiC,CAArB,CAAhB;EA2BA,MAAMlB,KAAK,GAAG,IAAAmB,kBAAA,EAAY;IACtBlB,SADsB;IAEtBG;EAFsB,CAAZ,CAAd;EAKA,MAAMF,OAAO,GAAG,IAAAkB,4CAAA,EAAyB;IACrCnB,SAAS,EAAEE,WAD0B;IAErCC;EAFqC,CAAzB,CAAhB;EAKA,MAAMiB,QAAQ,GAAG;IACb;AACR;AACA;IACQC,IAAI,EAAE,IAAAC,sBAAA,EAAiB;MACnBC,UAAU,EAAEC,eAAA,CAASC,IADF;MAEnB1B,KAFmB;MAGnBD,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASC,IAAV,CAAb,GAA+B;IAHlC,CAAjB,CAJO;IASbC,UAAU,EAAE,IAAAC,kCAAA,EAAuB;MAC/BJ,UAAU,EAAEC,eAAA,CAASI,UADU;MAE/B7B,KAF+B;MAG/BD,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASI,UAAV,CAAb,GAAqC;IAH5B,CAAvB,CATC;IAcbC,MAAM,EAAE,IAAAC,0BAAA,EAAmB;MACvBP,UAAU,EAAEC,eAAA,CAASO,MADE;MAEvBhC,KAFuB;MAGvBD,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASO,MAAV,CAAb,GAAiC;IAHhC,CAAnB,CAdK;IAmBbC,QAAQ,EAAE,IAAAC,8BAAA,EAAqB;MAC3BV,UAAU,EAAEC,eAAA,CAASU,QADM;MAE3BnC,KAF2B;MAG3BD,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASU,QAAV,CAAb,GAAmC;IAH9B,CAArB,CAnBG;;IAwBb;AACR;AACA;IACQC,MAAM,EAAE,IAAAC,wCAAA,EAA0B;MAC9Bb,UAAU,EAAEC,eAAA,CAASa,OADS;MAE9BtC,KAAK,EAAEE,OAFuB;MAG9BH,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASa,OAAV,CAAb,GAAkC;IAH1B,CAA1B,CA3BK;IAgCbC,YAAY,EAAE,IAAAF,wCAAA,EAA0B;MACpCb,UAAU,EAAEC,eAAA,CAASe,aADe;MAEpCxC,KAAK,EAAEE,OAF6B;MAGpCH,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAAC0B,eAAA,CAASe,aAAV,CAAb,GAAwC;IAH1B,CAA1B;EAhCD,CAAjB;EAuCA;IACIC,IAAI,EAAE,MAAMC,OAAN,IAAiB;MACnBA,OAAO,CAACC,IAAR,CAAaC,OAAb,CAAqBC,oBAArB,CAA0CC,SAA1C,CAAoD,OAAO;QAAEC,MAAF;QAAUC;MAAV,CAAP,KAA8B;QAC9E,MAAM,IAAAC,kDAAA,EAAyB;UAC3B5C,aAD2B;UAE3BC,OAF2B;UAG3B0C,MAH2B;UAI3BD,MAAM,EAAEA,MAAM,CAACG;QAJY,CAAzB,CAAN;MAMH,CAPD;IAQH,CAVL;IAWIC,OAAO,EAAE,IAXb;IAYIC,QAAQ,EAAE,MAAMpD,KAZpB;IAaIqD,UAAU,EAAE,MAAMnD,OAbtB;IAcIoD,WAAW,EAAE,MAAMjC;EAdvB,GAeO,IAAAkC,sCAAA,EAA8B;IAC7BvD,KAD6B;IAE7BwD,MAAM,EAAEnC,QAAQ,CAACS;EAFY,CAA9B,CAfP,GAmBO,IAAA2B,0CAAA,EAAgC;IAC/BzD,KAD+B;IAE/BwD,MAAM,EAAEnC,QAAQ,CAACY;EAFc,CAAhC,CAnBP,GAuBO,IAAAyB,kCAAA,EAA4B;IAC3BrD,aAD2B;IAE3BL,KAF2B;IAG3BwD,MAAM,EAAEnC,QAAQ,CAACC,IAHU;IAI3BqC,QAAQ,EAAEtC,QAAQ,CAACe,MAJQ;IAK3B9B;EAL2B,CAA5B,CAvBP,GA8BO,IAAAsD,8CAAA,EAAkC;IACjCvD,aADiC;IAEjCL,KAFiC;IAGjCwD,MAAM,EAAEnC,QAAQ,CAACM,UAHgB;IAIjCgC,QAAQ,EAAEtC,QAAQ,CAACkB,YAJc;IAKjCjC;EALiC,CAAlC,CA9BP;AAsCH,CAlIM"}

package/operations/form/elasticsearchBody.js

@@ -1,21 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormElasticType = exports.createElasticsearchBody = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _cursors = require("@webiny/api-elasticsearch/cursors");
-
-var _sort = require("@webiny/api-elasticsearch/sort");
-
-var _limit = require("@webiny/api-elasticsearch/limit");
-
-var _ElasticsearchQueryBuilderOperatorPlugin = require("@webiny/api-elasticsearch/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin");
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
 
 var _FormElasticsearchFieldPlugin = require("../../plugins/FormElasticsearchFieldPlugin");
 
@@ -25,12 +19,6 @@ var _FormElasticsearchBodyModifierPlugin = require("../../plugins/FormElasticsea
 
 var _FormElasticsearchQueryModifierPlugin = require("../../plugins/FormElasticsearchQueryModifierPlugin");
 
-var _where = require("@webiny/api-elasticsearch/where");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 const createFormElasticType = () => {
   return "fb.form";
 };
@@ -65,12 +53,8 @@ const createElasticsearchQuery = params => {
    * Be aware that, if having more registered operator plugins of same type, the last one will be used.
    */
 
-  const operatorPlugins = plugins.byType(_ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin.type).reduce((acc, plugin) => {
-    acc[plugin.getOperator()] = plugin;
-    return acc;
-  }, {});
-
-  const where = _objectSpread({}, initialWhere);
+  const operatorPlugins = (0, _apiElasticsearch.getElasticsearchOperatorPluginsByLocale)(plugins, initialWhere.locale);
+  const where = (0, _objectSpread2.default)({}, initialWhere);
   /**
    * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.
    *
@@ -78,10 +62,9 @@ const createElasticsearchQuery = params => {
    * No need for the tenant filtering otherwise as each index is for single tenant.
    */
 
-
   const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
 
-  if (sharedIndex) {
+  if (sharedIndex && where.tenant) {
     query.must.push({
       term: {
         "tenant.keyword": where.tenant
@@ -109,7 +92,7 @@ const createElasticsearchQuery = params => {
    * We apply other conditions as they are passed via the where value.
    */
 
-  (0, _where.applyWhere)({
+  (0, _apiElasticsearch.applyWhere)({
     query,
     where,
     fields: fieldPlugins,
@@ -130,11 +113,11 @@ const createElasticsearchBody = params => {
     acc[plugin.field] = plugin;
     return acc;
   }, {});
-  const limit = (0, _limit.createLimit)(initialLimit, 100);
-  const query = createElasticsearchQuery(_objectSpread(_objectSpread({}, params), {}, {
+  const limit = (0, _apiElasticsearch.createLimit)(initialLimit, 100);
+  const query = createElasticsearchQuery((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
     fieldPlugins
   }));
-  const sort = (0, _sort.createSort)({
+  const sort = (0, _apiElasticsearch.createSort)({
     sort: initialSort,
     fieldPlugins
   });
@@ -159,7 +142,7 @@ const createElasticsearchBody = params => {
     query: {
       constant_score: {
         filter: {
-          bool: _objectSpread({}, query)
+          bool: (0, _objectSpread2.default)({}, query)
         }
       }
     },
@@ -170,7 +153,7 @@ const createElasticsearchBody = params => {
      * Which is correct in some cases. In our case, it is not.
      * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html
      */
-    search_after: (0, _cursors.decodeCursor)(after),
+    search_after: (0, _apiElasticsearch.decodeCursor)(after),
     sort
   };
   const bodyModifiers = plugins.byType(_FormElasticsearchBodyModifierPlugin.FormElasticsearchBodyModifierPlugin.type);

package/operations/form/elasticsearchBody.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createFormElasticType","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","getElasticsearchOperatorPluginsByLocale","locale","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","applyWhere","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","byType","FormElasticsearchFieldPlugin","type","reduce","acc","plugin","field","createLimit","createSort","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","decodeCursor","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"sources":["elasticsearchBody.ts"],"sourcesContent":["import { SearchBody as esSearchBody } from \"elastic-ts\";\nimport {\n    decodeCursor,\n    getElasticsearchOperatorPluginsByLocale,\n    applyWhere,\n    createLimit,\n    createSort\n} from \"@webiny/api-elasticsearch\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\nimport { FormElasticsearchSortModifierPlugin } from \"~/plugins/FormElasticsearchSortModifierPlugin\";\nimport { FormElasticsearchBodyModifierPlugin } from \"~/plugins/FormElasticsearchBodyModifierPlugin\";\nimport { FormBuilderStorageOperationsListFormsParams } from \"@webiny/api-form-builder/types\";\nimport { FormElasticsearchQueryModifierPlugin } from \"~/plugins/FormElasticsearchQueryModifierPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport const createFormElasticType = (): string => {\n    return \"fb.form\";\n};\n\nconst createInitialQueryValue = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [\n            /**\n             * We add the __type filtering in the initial query because it must be applied.\n             */\n            {\n                term: {\n                    \"__type.keyword\": createFormElasticType()\n                }\n            }\n        ],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface CreateElasticsearchQueryParams extends CreateElasticsearchBodyParams {\n    fieldPlugins: Record<string, FormElasticsearchFieldPlugin>;\n}\n\nconst createElasticsearchQuery = (params: CreateElasticsearchQueryParams) => {\n    const { plugins, where: initialWhere, fieldPlugins } = params;\n    const query = createInitialQueryValue();\n    /**\n     * Be aware that, if having more registered operator plugins of same type, the last one will be used.\n     */\n    const operatorPlugins = getElasticsearchOperatorPluginsByLocale(plugins, initialWhere.locale);\n\n    const where: Partial<FormBuilderStorageOperationsListFormsParams[\"where\"]> = {\n        ...initialWhere\n    };\n    /**\n     * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.\n     *\n     * When ES index is shared between tenants, we need to filter records by tenant ID.\n     * No need for the tenant filtering otherwise as each index is for single tenant.\n     */\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex && where.tenant) {\n        query.must.push({\n            term: {\n                \"tenant.keyword\": where.tenant\n            }\n        });\n    }\n    /**\n     * Remove tenant so it is not applied again later.\n     * Possibly tenant is not defined, but just in case, remove it.\n     */\n    delete where.tenant;\n    /**\n     * Add the locale to filtering.\n     */\n    query.must.push({\n        term: {\n            \"locale.keyword\": where.locale as string\n        }\n    });\n    delete where.locale;\n    /**\n     * We apply other conditions as they are passed via the where value.\n     */\n    applyWhere({\n        query,\n        where,\n        fields: fieldPlugins,\n        operators: operatorPlugins\n    });\n\n    return query;\n};\n\ninterface CreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    where: FormBuilderStorageOperationsListFormsParams[\"where\"];\n    limit: number;\n    after?: string;\n    sort: string[];\n}\n\nexport const createElasticsearchBody = (params: CreateElasticsearchBodyParams): esSearchBody => {\n    const { plugins, where, limit: initialLimit, sort: initialSort, after } = params;\n\n    const fieldPlugins = plugins\n        .byType<FormElasticsearchFieldPlugin>(FormElasticsearchFieldPlugin.type)\n        .reduce((acc, plugin) => {\n            acc[plugin.field] = plugin;\n            return acc;\n        }, {} as Record<string, FormElasticsearchFieldPlugin>);\n\n    const limit = createLimit(initialLimit, 100);\n\n    const query = createElasticsearchQuery({\n        ...params,\n        fieldPlugins\n    });\n\n    const sort = createSort({\n        sort: initialSort,\n        fieldPlugins\n    });\n\n    const queryModifiers = plugins.byType<FormElasticsearchQueryModifierPlugin>(\n        FormElasticsearchQueryModifierPlugin.type\n    );\n\n    for (const plugin of queryModifiers) {\n        plugin.modifyQuery({\n            query,\n            where\n        });\n    }\n\n    const sortModifiers = plugins.byType<FormElasticsearchSortModifierPlugin>(\n        FormElasticsearchSortModifierPlugin.type\n    );\n\n    for (const plugin of sortModifiers) {\n        plugin.modifySort({\n            sort\n        });\n    }\n\n    const body = {\n        query: {\n            constant_score: {\n                filter: {\n                    bool: {\n                        ...query\n                    }\n                }\n            }\n        },\n        size: limit + 1,\n        /**\n         * Casting as any is required due to search_after is accepting an array of values.\n         * Which is correct in some cases. In our case, it is not.\n         * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html\n         */\n        search_after: decodeCursor(after) as any,\n        sort\n    };\n\n    const bodyModifiers = plugins.byType<FormElasticsearchBodyModifierPlugin>(\n        FormElasticsearchBodyModifierPlugin.type\n    );\n\n    for (const plugin of bodyModifiers) {\n        plugin.modifyBody({\n            body\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}

package/operations/form/elasticsearchFields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FormElasticsearchFieldPlugin","field","unmappedType","path","ALL"],"sources":["elasticsearchFields.ts"],"sourcesContent":["import { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\n\nexport default () => [\n    new FormElasticsearchFieldPlugin({\n        field: \"createdOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"savedOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"publishedOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"ownedBy\",\n        path: \"ownedBy.id\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"createdBy\",\n        path: \"createdBy.id\"\n    }),\n    /**\n     * Always add the ALL fields plugin because of the keyword/path build.\n     */\n    new FormElasticsearchFieldPlugin({\n        field: FormElasticsearchFieldPlugin.ALL\n    })\n];\n"],"mappings":";;;;;;;AAAA;;eAEe,MAAM,CACjB,IAAIA,0DAAJ,CAAiC;EAC7BC,KAAK,EAAE,WADsB;EAE7BC,YAAY,EAAE;AAFe,CAAjC,CADiB,EAKjB,IAAIF,0DAAJ,CAAiC;EAC7BC,KAAK,EAAE,SADsB;EAE7BC,YAAY,EAAE;AAFe,CAAjC,CALiB,EASjB,IAAIF,0DAAJ,CAAiC;EAC7BC,KAAK,EAAE,aADsB;EAE7BC,YAAY,EAAE;AAFe,CAAjC,CATiB,EAajB,IAAIF,0DAAJ,CAAiC;EAC7BC,KAAK,EAAE,SADsB;EAE7BE,IAAI,EAAE;AAFuB,CAAjC,CAbiB,EAiBjB,IAAIH,0DAAJ,CAAiC;EAC7BC,KAAK,EAAE,WADsB;EAE7BE,IAAI,EAAE;AAFuB,CAAjC,CAjBiB;AAqBjB;AACJ;AACA;AACI,IAAIH,0DAAJ,CAAiC;EAC7BC,KAAK,EAAED,0DAAA,CAA6BI;AADP,CAAjC,CAxBiB,C"}

package/operations/form/fields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FormDynamoDbFieldPlugin","field","type"],"sources":["fields.ts"],"sourcesContent":["import { FormDynamoDbFieldPlugin } from \"~/plugins/FormDynamoDbFieldPlugin\";\n\nexport default () => [\n    new FormDynamoDbFieldPlugin({\n        field: \"publishedOn\",\n        type: \"date\"\n    })\n];\n"],"mappings":";;;;;;;AAAA;;eAEe,MAAM,CACjB,IAAIA,gDAAJ,CAA4B;EACxBC,KAAK,EAAE,aADiB;EAExBC,IAAI,EAAE;AAFkB,CAA5B,CADiB,C"}

package/operations/form/index.d.ts

@@ -7,11 +7,11 @@ export declare type DbRecord<T = any> = T & {
     SK: string;
     TYPE: string;
 };
-export interface Params {
+export interface CreateFormStorageOperationsParams {
     entity: Entity<any>;
     esEntity: Entity<any>;
     table: Table;
     elasticsearch: Client;
     plugins: PluginsContainer;
 }
-export declare const createFormStorageOperations: (params: Params) => FormBuilderFormStorageOperations;
+export declare const createFormStorageOperations: (params: CreateFormStorageOperationsParams) => FormBuilderFormStorageOperations;

package/operations/form/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormStorageOperations = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _query = require("@webiny/db-dynamodb/utils/query");
 
@@ -17,7 +17,7 @@ var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
 
-var _configurations = _interopRequireDefault(require("../../configurations"));
+var _configurations = require("../../configurations");
 
 var _filter = require("@webiny/db-dynamodb/utils/filter");
 
@@ -29,11 +29,7 @@ var _utils = require("@webiny/utils");
 
 var _elasticsearchBody = require("./elasticsearchBody");
 
-var _cursors = require("@webiny/api-elasticsearch/cursors");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
 
 const getESDataForLatestRevision = form => ({
   __type: (0, _elasticsearchBody.createFormElasticType)(),
@@ -114,9 +110,9 @@ const createFormStorageOperations = params => {
       PK: createFormPartitionKey(form),
       SK: createLatestSortKey()
     };
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, form), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
       TYPE: createFormType()
-    }, revisionKeys)), entity.putBatch(_objectSpread(_objectSpread({}, form), {}, {
+    }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
       TYPE: createFormLatestType()
     }, latestKeys))];
 
@@ -136,11 +132,12 @@ const createFormStorageOperations = params => {
     try {
       const {
         index
-      } = _configurations.default.es({
-        tenant: form.tenant
+      } = _configurations.configurations.es({
+        tenant: form.tenant,
+        locale: form.locale
       });
 
-      await esEntity.put(_objectSpread({
+      await esEntity.put((0, _objectSpread2.default)({
         index,
         data: getESDataForLatestRevision(form),
         TYPE: createFormType()
@@ -169,9 +166,9 @@ const createFormStorageOperations = params => {
       PK: createFormPartitionKey(form),
       SK: createLatestSortKey()
     };
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
       TYPE: createFormType()
-    })), entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), latestKeys), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
       TYPE: createFormLatestType()
     }))];
 
@@ -193,11 +190,12 @@ const createFormStorageOperations = params => {
     try {
       const {
         index
-      } = _configurations.default.es({
-        tenant: form.tenant
+      } = _configurations.configurations.es({
+        tenant: form.tenant,
+        locale: form.locale
       });
 
-      await esEntity.put(_objectSpread({
+      await esEntity.put((0, _objectSpread2.default)({
         index,
         data: getESDataForLatestRevision(form),
         TYPE: createFormLatestType()
@@ -241,12 +239,12 @@ const createFormStorageOperations = params => {
       }
     });
     const isLatestForm = latestForm ? latestForm.id === form.id : false;
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, form), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
       TYPE: createFormType()
     }, revisionKeys))];
 
     if (isLatestForm) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, form), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
         TYPE: createFormLatestType()
       }, latestKeys)));
     }
@@ -277,11 +275,12 @@ const createFormStorageOperations = params => {
     try {
       const {
         index
-      } = _configurations.default.es({
-        tenant: form.tenant
+      } = _configurations.configurations.es({
+        tenant: form.tenant,
+        locale: form.locale
       });
 
-      await esEntity.put(_objectSpread({
+      await esEntity.put((0, _objectSpread2.default)({
         index,
         data: getESDataForLatestRevision(form),
         TYPE: createFormLatestType()
@@ -369,17 +368,17 @@ const createFormStorageOperations = params => {
       sort,
       limit: limit + 1,
       where,
-      after: (0, _cursors.decodeCursor)(after)
+      after: (0, _apiElasticsearch.decodeCursor)(after)
     });
 
-    const esConfig = _configurations.default.es({
-      tenant: where.tenant
+    const esConfig = _configurations.configurations.es({
+      tenant: where.tenant,
+      locale: where.locale
     });
 
-    const query = _objectSpread(_objectSpread({}, esConfig), {}, {
+    const query = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, esConfig), {}, {
       body
     });
-
     let response;
 
     try {
@@ -413,7 +412,7 @@ const createFormStorageOperations = params => {
     const meta = {
       hasMoreItems,
       totalCount: total.value,
-      cursor: items.length > 0 ? (0, _cursors.encodeCursor)(hits[items.length - 1].sort) : null
+      cursor: items.length > 0 ? (0, _apiElasticsearch.encodeCursor)(hits[items.length - 1].sort) || null : null
     };
     return {
       items,
@@ -454,11 +453,10 @@ const createFormStorageOperations = params => {
       });
     }
 
-    const where = _objectSpread(_objectSpread({}, initialWhere), {}, {
+    const where = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialWhere), {}, {
       id: undefined,
       formId: undefined
     });
-
     const filteredItems = (0, _filter.filterItems)({
       plugins,
       items,
@@ -466,7 +464,7 @@ const createFormStorageOperations = params => {
       fields: formDynamoDbFields
     });
 
-    if (Array.isArray(sort) === false || sort.length === 0) {
+    if (!sort || sort.length === 0) {
       return filteredItems;
     }
 
@@ -573,14 +571,14 @@ const createFormStorageOperations = params => {
         }).shift();
 
         if (previouslyPublishedForm) {
-          items.push(entity.putBatch(_objectSpread(_objectSpread({}, previouslyPublishedForm), {}, {
+          items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedForm), {}, {
             PK: createFormPartitionKey(previouslyPublishedForm),
             SK: createLatestPublishedSortKey(),
             TYPE: createFormLatestPublishedType()
           })));
         } else {
           items.push(entity.deleteBatch({
-            PK: createFormPartitionKey(previouslyPublishedForm),
+            PK: createFormPartitionKey(form),
             SK: createLatestPublishedSortKey()
           }));
         }
@@ -590,18 +588,19 @@ const createFormStorageOperations = params => {
        */
 
 
-      if (isLatest) {
-        items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, previous), latestKeys), {}, {
+      if (isLatest && previous) {
+        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previous), latestKeys), {}, {
           TYPE: createFormLatestType()
         })));
 
         const {
           index
-        } = _configurations.default.es({
-          tenant: previous.tenant
+        } = _configurations.configurations.es({
+          tenant: previous.tenant,
+          locale: previous.locale
         });
 
-        esDataItem = _objectSpread(_objectSpread({
+        esDataItem = (0, _objectSpread2.default)((0, _objectSpread2.default)({
           index
         }, latestKeys), {}, {
           data: getESDataForLatestRevision(previous)
@@ -691,9 +690,9 @@ const createFormStorageOperations = params => {
      * Update revision and latest published records
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
       TYPE: createFormType()
-    })), entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), latestPublishedKeys), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestPublishedKeys), {}, {
       TYPE: createFormLatestPublishedType()
     }))];
     /**
@@ -701,7 +700,7 @@ const createFormStorageOperations = params => {
      */
 
     if (isLatestForm) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), latestKeys), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
         TYPE: createFormLatestType()
       })));
     }
@@ -728,14 +727,15 @@ const createFormStorageOperations = params => {
 
     const {
       index
-    } = _configurations.default.es({
-      tenant: form.tenant
+    } = _configurations.configurations.es({
+      tenant: form.tenant,
+      locale: form.locale
     });
 
     const esData = getESDataForLatestRevision(form);
 
     try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
+      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
         TYPE: createFormLatestType(),
         data: esData
@@ -800,7 +800,7 @@ const createFormStorageOperations = params => {
     });
     const isLatest = latestForm ? latestForm.id === form.id : false;
     const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
       TYPE: createFormType()
     }))];
     let esData = undefined;
@@ -828,7 +828,7 @@ const createFormStorageOperations = params => {
       const previouslyPublishedRevision = revisions.shift();
 
       if (previouslyPublishedRevision) {
-        items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, previouslyPublishedRevision), latestPublishedKeys), {}, {
+        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedRevision), latestPublishedKeys), {}, {
           TYPE: createFormLatestPublishedType()
         })));
       } else {
@@ -862,12 +862,13 @@ const createFormStorageOperations = params => {
 
     const {
       index
-    } = _configurations.default.es({
-      tenant: form.tenant
+    } = _configurations.configurations.es({
+      tenant: form.tenant,
+      locale: form.locale
     });
 
     try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
+      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
         TYPE: createFormLatestType(),
         data: esData