@webiny/api-form-builder-so-ddb-es 5.25.0 → 5.26.0-beta.0

package/configurations.d.ts

@@ -1,10 +1,11 @@
 export interface ElasticsearchConfigParams {
     tenant: string;
+    locale: string;
 }
 interface ElasticsearchConfig {
     index: string;
 }
-declare const _default: {
+export declare const configurations: {
     es(params: ElasticsearchConfigParams): ElasticsearchConfig;
 };
-export default _default;
+export {};

package/configurations.js

@@ -1,28 +1,50 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-var _default = {
+exports.configurations = void 0;
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+const configurations = {
   es(params) {
     const {
-      tenant
+      tenant,
+      locale
     } = params;
+
+    if (!tenant) {
+      throw new _error.default(`Missing "tenant" parameter when trying to create Elasticsearch index name.`, "TENANT_ERROR");
+    }
+
     const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
-    const index = `${sharedIndex ? "root" : tenant}-form-builder`;
-    const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;
+    const tenantId = sharedIndex ? "root" : tenant;
+    let localeCode = null;
+
+    if (process.env.WEBINY_ELASTICSEARCH_INDEX_LOCALE === "true") {
+      if (!locale) {
+        throw new _error.default(`Missing "locale" parameter when trying to create Elasticsearch index name.`, "LOCALE_ERROR");
+      }
+
+      localeCode = locale;
+    }
+
+    const index = [tenantId, localeCode, "form-builder"].filter(Boolean).join("-").toLowerCase();
+    const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || "";
 
-    if (prefix) {
+    if (!prefix) {
       return {
-        index: prefix + index
+        index
       };
     }
 
     return {
-      index
+      index: prefix + index
     };
   }
 
 };
-exports.default = _default;
+exports.configurations = configurations;

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["configurations.ts"],"names":["es","params","tenant","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;eAQe;AACXA,EAAAA,EAAE,CAACC,MAAD,EAAyD;AACvD,UAAM;AAAEC,MAAAA;AAAF,QAAaD,MAAnB;AAEA,UAAME,WAAW,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,KAA6C,MAAjE;AACA,UAAMC,KAAK,GAAI,GAAEJ,WAAW,GAAG,MAAH,GAAYD,MAAO,eAA/C;AAEA,UAAMM,MAAM,GAAGJ,OAAO,CAACC,GAAR,CAAYI,2BAA3B;;AACA,QAAID,MAAJ,EAAY;AACR,aAAO;AAAED,QAAAA,KAAK,EAAEC,MAAM,GAAGD;AAAlB,OAAP;AACH;;AACD,WAAO;AAAEA,MAAAA;AAAF,KAAP;AACH;;AAZU,C","sourcesContent":["export interface ElasticsearchConfigParams {\n    tenant: string;\n}\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\nexport default {\n    es(params: ElasticsearchConfigParams): ElasticsearchConfig {\n        const { tenant } = params;\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = `${sharedIndex ? \"root\" : tenant}-form-builder`;\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;\n        if (prefix) {\n            return { index: prefix + index };\n        }\n        return { index };\n    }\n};\n"]}
+{"version":3,"sources":["configurations.ts"],"names":["configurations","es","params","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenantId","localeCode","WEBINY_ELASTICSEARCH_INDEX_LOCALE","index","filter","Boolean","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;;;;AAAA;;AAWO,MAAMA,cAAc,GAAG;AAC1BC,EAAAA,EAAE,CAACC,MAAD,EAAyD;AACvD,UAAM;AAAEC,MAAAA,MAAF;AAAUC,MAAAA;AAAV,QAAqBF,MAA3B;;AACA,QAAI,CAACC,MAAL,EAAa;AACT,YAAM,IAAIE,cAAJ,CACD,4EADC,EAEF,cAFE,CAAN;AAIH;;AAED,UAAMC,WAAW,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,KAA6C,MAAjE;AAEA,UAAMC,QAAQ,GAAGJ,WAAW,GAAG,MAAH,GAAYH,MAAxC;AACA,QAAIQ,UAAyB,GAAG,IAAhC;;AACA,QAAIJ,OAAO,CAACC,GAAR,CAAYI,iCAAZ,KAAkD,MAAtD,EAA8D;AAC1D,UAAI,CAACR,MAAL,EAAa;AACT,cAAM,IAAIC,cAAJ,CACD,4EADC,EAEF,cAFE,CAAN;AAIH;;AACDM,MAAAA,UAAU,GAAGP,MAAb;AACH;;AAED,UAAMS,KAAK,GAAG,CAACH,QAAD,EAAWC,UAAX,EAAuB,cAAvB,EACTG,MADS,CACFC,OADE,EAETC,IAFS,CAEJ,GAFI,EAGTC,WAHS,EAAd;AAKA,UAAMC,MAAM,GAAGX,OAAO,CAACC,GAAR,CAAYW,2BAAZ,IAA2C,EAA1D;;AACA,QAAI,CAACD,MAAL,EAAa;AACT,aAAO;AACHL,QAAAA;AADG,OAAP;AAGH;;AACD,WAAO;AACHA,MAAAA,KAAK,EAAEK,MAAM,GAAGL;AADb,KAAP;AAGH;;AAtCyB,CAAvB","sourcesContent":["import WebinyError from \"@webiny/error\";\n\nexport interface ElasticsearchConfigParams {\n    tenant: string;\n    locale: string;\n}\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\nexport const configurations = {\n    es(params: ElasticsearchConfigParams): ElasticsearchConfig {\n        const { tenant, locale } = params;\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n\n        const tenantId = sharedIndex ? \"root\" : tenant;\n        let localeCode: string | null = null;\n        if (process.env.WEBINY_ELASTICSEARCH_INDEX_LOCALE === \"true\") {\n            if (!locale) {\n                throw new WebinyError(\n                    `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                    \"LOCALE_ERROR\"\n                );\n            }\n            localeCode = locale;\n        }\n\n        const index = [tenantId, localeCode, \"form-builder\"]\n            .filter(Boolean)\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"]}

package/{operations/system → elasticsearch}/createElasticsearchIndex.d.ts

@@ -1,7 +1,10 @@
 import { Client } from "@elastic/elasticsearch";
+import { PluginsContainer } from "@webiny/plugins";
 interface CreateElasticsearchIndexParams {
     elasticsearch: Client;
+    plugins: PluginsContainer;
     tenant: string;
+    locale: string;
 }
 export declare const createElasticsearchIndex: (params: CreateElasticsearchIndexParams) => Promise<void>;
 export {};

package/elasticsearch/createElasticsearchIndex.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createElasticsearchIndex = void 0;
+
+var _indices = require("@webiny/api-elasticsearch/indices");
+
+var _FormElasticsearchIndexPlugin = require("../plugins/FormElasticsearchIndexPlugin");
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _configurations = require("../configurations");
+
+const createElasticsearchIndex = async params => {
+  const {
+    elasticsearch,
+    plugins: container,
+    locale,
+    tenant
+  } = params;
+  const plugin = (0, _indices.getLastAddedIndexPlugin)({
+    container,
+    type: _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin.type,
+    locale
+  });
+
+  const {
+    index
+  } = _configurations.configurations.es({
+    locale,
+    tenant
+  });
+
+  try {
+    const response = await elasticsearch.indices.exists({
+      index
+    });
+
+    if (response.body) {
+      return;
+    }
+
+    await elasticsearch.indices.create({
+      index,
+      body: plugin.body
+    });
+  } catch (ex) {
+    throw new _error.default(ex.message || "Could not create Elasticsearch index for the Form Builder.", ex.code || "FB_ELASTICSEARCH_INDEX_ERROR", {
+      error: ex,
+      type: _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin.type,
+      locale,
+      tenant,
+      index,
+      body: plugin.body
+    });
+  }
+};
+
+exports.createElasticsearchIndex = createElasticsearchIndex;

package/elasticsearch/createElasticsearchIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["createElasticsearchIndex.ts"],"names":["createElasticsearchIndex","params","elasticsearch","plugins","container","locale","tenant","plugin","type","FormElasticsearchIndexPlugin","index","configurations","es","response","indices","exists","body","create","ex","WebinyError","message","code","error"],"mappings":";;;;;;;;;AACA;;AACA;;AAEA;;AACA;;AASO,MAAMA,wBAAwB,GAAG,MAAOC,MAAP,IAAkD;AACtF,QAAM;AAAEC,IAAAA,aAAF;AAAiBC,IAAAA,OAAO,EAAEC,SAA1B;AAAqCC,IAAAA,MAArC;AAA6CC,IAAAA;AAA7C,MAAwDL,MAA9D;AAEA,QAAMM,MAAM,GAAG,sCAAsD;AACjEH,IAAAA,SADiE;AAEjEI,IAAAA,IAAI,EAAEC,2DAA6BD,IAF8B;AAGjEH,IAAAA;AAHiE,GAAtD,CAAf;;AAMA,QAAM;AAAEK,IAAAA;AAAF,MAAYC,+BAAeC,EAAf,CAAkB;AAChCP,IAAAA,MADgC;AAEhCC,IAAAA;AAFgC,GAAlB,CAAlB;;AAKA,MAAI;AACA,UAAMO,QAAQ,GAAG,MAAMX,aAAa,CAACY,OAAd,CAAsBC,MAAtB,CAA6B;AAChDL,MAAAA;AADgD,KAA7B,CAAvB;;AAGA,QAAIG,QAAQ,CAACG,IAAb,EAAmB;AACf;AACH;;AAED,UAAMd,aAAa,CAACY,OAAd,CAAsBG,MAAtB,CAA6B;AAC/BP,MAAAA,KAD+B;AAE/BM,MAAAA,IAAI,EAAET,MAAM,CAACS;AAFkB,KAA7B,CAAN;AAIH,GAZD,CAYE,OAAOE,EAAP,EAAW;AACT,UAAM,IAAIC,cAAJ,CACFD,EAAE,CAACE,OAAH,IAAc,4DADZ,EAEFF,EAAE,CAACG,IAAH,IAAW,8BAFT,EAGF;AACIC,MAAAA,KAAK,EAAEJ,EADX;AAEIV,MAAAA,IAAI,EAAEC,2DAA6BD,IAFvC;AAGIH,MAAAA,MAHJ;AAIIC,MAAAA,MAJJ;AAKII,MAAAA,KALJ;AAMIM,MAAAA,IAAI,EAAET,MAAM,CAACS;AANjB,KAHE,CAAN;AAYH;AACJ,CAxCM","sourcesContent":["import { Client } from \"@elastic/elasticsearch\";\nimport { getLastAddedIndexPlugin } from \"@webiny/api-elasticsearch/indices\";\nimport { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { configurations } from \"~/configurations\";\n\ninterface CreateElasticsearchIndexParams {\n    elasticsearch: Client;\n    plugins: PluginsContainer;\n    tenant: string;\n    locale: string;\n}\n\nexport const createElasticsearchIndex = async (params: CreateElasticsearchIndexParams) => {\n    const { elasticsearch, plugins: container, locale, tenant } = params;\n\n    const plugin = getLastAddedIndexPlugin<FormElasticsearchIndexPlugin>({\n        container,\n        type: FormElasticsearchIndexPlugin.type,\n        locale\n    });\n\n    const { index } = configurations.es({\n        locale,\n        tenant\n    });\n\n    try {\n        const response = await elasticsearch.indices.exists({\n            index\n        });\n        if (response.body) {\n            return;\n        }\n\n        await elasticsearch.indices.create({\n            index,\n            body: plugin.body\n        });\n    } catch (ex) {\n        throw new WebinyError(\n            ex.message || \"Could not create Elasticsearch index for the Form Builder.\",\n            ex.code || \"FB_ELASTICSEARCH_INDEX_ERROR\",\n            {\n                error: ex,\n                type: FormElasticsearchIndexPlugin.type,\n                locale,\n                tenant,\n                index,\n                body: plugin.body\n            }\n        );\n    }\n};\n"]}

package/elasticsearch/indices/base.d.ts

@@ -0,0 +1,2 @@
+import { FormElasticsearchIndexPlugin } from "../../plugins/FormElasticsearchIndexPlugin";
+export declare const base: FormElasticsearchIndexPlugin;

package/elasticsearch/indices/base.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _FormElasticsearchIndexPlugin = require("../../plugins/FormElasticsearchIndexPlugin");
+
+var _base = require("@webiny/api-elasticsearch/indexConfiguration/base");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const base = new _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin({
+  body: _objectSpread({}, _base.base)
+});
+exports.base = base;

package/elasticsearch/indices/base.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["base.ts"],"names":["base","FormElasticsearchIndexPlugin","body","baseConfiguration"],"mappings":";;;;;;;;;;;AAAA;;AACA;;;;;;AAEO,MAAMA,IAAI,GAAG,IAAIC,0DAAJ,CAAiC;AACjDC,EAAAA,IAAI,oBACGC,UADH;AAD6C,CAAjC,CAAb","sourcesContent":["import { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\nimport { base as baseConfiguration } from \"@webiny/api-elasticsearch/indexConfiguration/base\";\n\nexport const base = new FormElasticsearchIndexPlugin({\n    body: {\n        ...baseConfiguration\n    }\n});\n"]}

package/elasticsearch/indices/index.d.ts

@@ -0,0 +1 @@
+export declare const elasticsearchIndexPlugins: () => import("../../plugins/FormElasticsearchIndexPlugin").FormElasticsearchIndexPlugin[];

package/elasticsearch/indices/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.elasticsearchIndexPlugins = void 0;
+
+var _base = require("./base");
+
+var _japanese = require("./japanese");
+
+const elasticsearchIndexPlugins = () => {
+  return [_base.base, _japanese.japanese];
+};
+
+exports.elasticsearchIndexPlugins = elasticsearchIndexPlugins;

package/elasticsearch/indices/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.ts"],"names":["elasticsearchIndexPlugins","base","japanese"],"mappings":";;;;;;;AAAA;;AACA;;AAEO,MAAMA,yBAAyB,GAAG,MAAM;AAC3C,SAAO,CAACC,UAAD,EAAOC,kBAAP,CAAP;AACH,CAFM","sourcesContent":["import { base } from \"./base\";\nimport { japanese } from \"./japanese\";\n\nexport const elasticsearchIndexPlugins = () => {\n    return [base, japanese];\n};\n"]}

package/elasticsearch/indices/japanese.d.ts

@@ -0,0 +1,2 @@
+import { FormElasticsearchIndexPlugin } from "../../plugins/FormElasticsearchIndexPlugin";
+export declare const japanese: FormElasticsearchIndexPlugin;

package/elasticsearch/indices/japanese.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.japanese = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _japanese = require("@webiny/api-elasticsearch/indexConfiguration/japanese");
+
+var _FormElasticsearchIndexPlugin = require("../../plugins/FormElasticsearchIndexPlugin");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const japanese = new _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin({
+  body: _objectSpread({}, _japanese.japanese),
+  locales: ["ja", "ja-jp"]
+});
+exports.japanese = japanese;

package/elasticsearch/indices/japanese.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["japanese.ts"],"names":["japanese","FormElasticsearchIndexPlugin","body","japaneseConfiguration","locales"],"mappings":";;;;;;;;;;;AAAA;;AACA;;;;;;AAEO,MAAMA,QAAQ,GAAG,IAAIC,0DAAJ,CAAiC;AACrDC,EAAAA,IAAI,oBACGC,kBADH,CADiD;AAIrDC,EAAAA,OAAO,EAAE,CAAC,IAAD,EAAO,OAAP;AAJ4C,CAAjC,CAAjB","sourcesContent":["import { japanese as japaneseConfiguration } from \"@webiny/api-elasticsearch/indexConfiguration/japanese\";\nimport { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\n\nexport const japanese = new FormElasticsearchIndexPlugin({\n    body: {\n        ...japaneseConfiguration\n    },\n    locales: [\"ja\", \"ja-jp\"]\n});\n"]}

package/index.js

@@ -9,10 +9,16 @@ exports.createFormBuilderStorageOperations = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-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,23 +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 _indices = require("./elasticsearch/indices");
+
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -72,7 +72,7 @@ const createFormBuilderStorageOperations = params => {
     esTable: esTableName,
     documentClient,
     elasticsearch,
-    plugins: pluginsInput
+    plugins: userPlugins
   } = params;
 
   if (attributes) {
@@ -85,15 +85,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 +101,11 @@ const createFormBuilderStorageOperations = params => {
   /**
    * Elasticsearch operators.
    */
-  (0, _operators.getElasticsearchOperators)()]);
+  (0, _operators.getElasticsearchOperators)(),
+  /**
+   * Built-in Elasticsearch index plugins
+   */
+  (0, _indices.elasticsearchIndexPlugins)()]);
   const table = (0, _table.createTable)({
     tableName,
     documentClient
@@ -150,17 +154,20 @@ const createFormBuilderStorageOperations = params => {
     })
   };
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    init: async formBuilder => {
-      formBuilder.onAfterInstall.subscribe(async ({
+    init: async context => {
+      context.i18n.locales.onBeforeCreate.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

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":["reservedFields","isReserved","name","includes","WebinyError","createFormBuilderStorageOperations","params","attributes","table","tableName","esTable","esTableName","documentClient","elasticsearch","plugins","pluginsInput","Object","values","forEach","attrs","keys","PluginsContainer","entities","form","entityName","ENTITIES","FORM","submission","SUBMISSION","system","SYSTEM","settings","SETTINGS","esForm","ES_FORM","esSubmission","ES_SUBMISSION","init","formBuilder","onAfterInstall","subscribe","tenant","upgrade","getTable","getEsTable","getEntities","entity","esEntity"],"mappings":"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","sourcesContent":["import { FormBuilderStorageOperationsFactory, ENTITIES } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\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 { createElasticsearchIndex } from \"~/operations/system/createElasticsearchIndex\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createElasticsearchEntity } from \"~/definitions/elasticsearch\";\nimport submissionElasticsearchFields from \"./operations/submission/elasticsearchFields\";\nimport formElasticsearchFields from \"./operations/form/elasticsearchFields\";\nimport dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport { getElasticsearchOperators } from \"@webiny/api-elasticsearch/operators\";\n\nimport upgrade5160 from \"./upgrades/5.16.0\";\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: pluginsInput\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        pluginsInput || [],\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\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 formBuilder => {\n            formBuilder.onAfterInstall.subscribe(async ({ tenant }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    tenant\n                });\n            });\n        },\n        upgrade: upgrade5160(),\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"]}
+{"version":3,"sources":["index.ts"],"names":["reservedFields","isReserved","name","includes","WebinyError","createFormBuilderStorageOperations","params","attributes","table","tableName","esTable","esTableName","documentClient","elasticsearch","plugins","userPlugins","Object","values","forEach","attrs","keys","PluginsContainer","entities","form","entityName","ENTITIES","FORM","submission","SUBMISSION","system","SYSTEM","settings","SETTINGS","esForm","ES_FORM","esSubmission","ES_SUBMISSION","init","context","i18n","locales","onBeforeCreate","subscribe","locale","tenant","code","upgrade","getTable","getEsTable","getEntities","entity","esEntity"],"mappings":"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","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/operators\";\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.onBeforeCreate.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"]}

package/operations/form/elasticsearchBody.js

@@ -15,8 +15,6 @@ var _sort = require("@webiny/api-elasticsearch/sort");
 
 var _limit = require("@webiny/api-elasticsearch/limit");
 
-var _ElasticsearchQueryBuilderOperatorPlugin = require("@webiny/api-elasticsearch/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 var _FormElasticsearchFieldPlugin = require("../../plugins/FormElasticsearchFieldPlugin");
 
 var _FormElasticsearchSortModifierPlugin = require("../../plugins/FormElasticsearchSortModifierPlugin");
@@ -27,6 +25,8 @@ var _FormElasticsearchQueryModifierPlugin = require("../../plugins/FormElasticse
 
 var _where = require("@webiny/api-elasticsearch/where");
 
+var _operators = require("@webiny/api-elasticsearch/operators");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -65,10 +65,7 @@ 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 operatorPlugins = (0, _operators.getElasticsearchOperatorPluginsByLocale)(plugins, initialWhere.locale);
 
   const where = _objectSpread({}, initialWhere);
   /**

package/operations/form/elasticsearchBody.js.map

@@ -1 +1 @@
-{"version":3,"sources":["elasticsearchBody.ts"],"names":["createFormElasticType","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","byType","ElasticsearchQueryBuilderOperatorPlugin","type","reduce","acc","plugin","getOperator","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","locale","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","FormElasticsearchFieldPlugin","field","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"mappings":"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","sourcesContent":["import { SearchBody as esSearchBody } from \"elastic-ts\";\nimport { decodeCursor } from \"@webiny/api-elasticsearch/cursors\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { createSort } from \"@webiny/api-elasticsearch/sort\";\nimport { createLimit } from \"@webiny/api-elasticsearch/limit\";\nimport { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\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\";\nimport { applyWhere } from \"@webiny/api-elasticsearch/where\";\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 = plugins\n        .byType<ElasticsearchQueryBuilderOperatorPlugin>(\n            ElasticsearchQueryBuilderOperatorPlugin.type\n        )\n        .reduce((acc, plugin) => {\n            acc[plugin.getOperator()] = plugin;\n            return acc;\n        }, {} as Record<string, ElasticsearchQueryBuilderOperatorPlugin>);\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"]}
+{"version":3,"sources":["elasticsearchBody.ts"],"names":["createFormElasticType","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","locale","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","byType","FormElasticsearchFieldPlugin","type","reduce","acc","plugin","field","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"mappings":"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","sourcesContent":["import { SearchBody as esSearchBody } from \"elastic-ts\";\nimport { decodeCursor } from \"@webiny/api-elasticsearch/cursors\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { createSort } from \"@webiny/api-elasticsearch/sort\";\nimport { createLimit } from \"@webiny/api-elasticsearch/limit\";\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\";\nimport { applyWhere } from \"@webiny/api-elasticsearch/where\";\nimport { getElasticsearchOperatorPluginsByLocale } from \"@webiny/api-elasticsearch/operators\";\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"]}

package/operations/form/index.js

@@ -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");
 
@@ -136,8 +136,9 @@ 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({
@@ -193,8 +194,9 @@ 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({
@@ -277,8 +279,9 @@ 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({
@@ -372,8 +375,9 @@ const createFormStorageOperations = params => {
       after: (0, _cursors.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), {}, {
@@ -597,8 +601,9 @@ const createFormStorageOperations = params => {
 
         const {
           index
-        } = _configurations.default.es({
-          tenant: previous.tenant
+        } = _configurations.configurations.es({
+          tenant: previous.tenant,
+          locale: previous.locale
         });
 
         esDataItem = _objectSpread(_objectSpread({
@@ -728,8 +733,9 @@ const createFormStorageOperations = params => {
 
     const {
       index
-    } = _configurations.default.es({
-      tenant: form.tenant
+    } = _configurations.configurations.es({
+      tenant: form.tenant,
+      locale: form.locale
     });
 
     const esData = getESDataForLatestRevision(form);
@@ -862,8 +868,9 @@ const createFormStorageOperations = params => {
 
     const {
       index
-    } = _configurations.default.es({
-      tenant: form.tenant
+    } = _configurations.configurations.es({
+      tenant: form.tenant,
+      locale: form.locale
     });
 
     try {