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

package/elasticsearch/createElasticsearchIndex.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createElasticsearchIndex = void 0;
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+var _FormElasticsearchIndexPlugin = require("../plugins/FormElasticsearchIndexPlugin");
+var _configurations = require("../configurations");
+const createElasticsearchIndex = async params => {
+  const {
+    elasticsearch,
+    plugins,
+    locale,
+    tenant
+  } = params;
+  const {
+    index
+  } = _configurations.configurations.es({
+    locale,
+    tenant
+  });
+  await (0, _apiElasticsearch.createIndex)({
+    client: elasticsearch,
+    index,
+    type: _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin.type,
+    tenant,
+    locale,
+    plugins,
+    onExists: () => {
+      console.log(`Elasticsearch index "${index}" for the Form Builder already exists.`);
+    },
+    onError: ex => {
+      console.error(`Could not create the Form Builder Elasticsearch index "${index}".`, ex);
+      return ex;
+    }
+  });
+};
+exports.createElasticsearchIndex = createElasticsearchIndex;
+
+//# sourceMappingURL=createElasticsearchIndex.js.map

package/elasticsearch/createElasticsearchIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiElasticsearch","require","_FormElasticsearchIndexPlugin","_configurations","createElasticsearchIndex","params","elasticsearch","plugins","locale","tenant","index","configurations","es","createIndex","client","type","FormElasticsearchIndexPlugin","onExists","console","log","onError","ex","error","exports"],"sources":["createElasticsearchIndex.ts"],"sourcesContent":["import type { Client } from \"@elastic/elasticsearch\";\nimport { createIndex } from \"@webiny/api-elasticsearch\";\nimport { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\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, locale, tenant } = params;\n\n    const { index } = configurations.es({\n        locale,\n        tenant\n    });\n\n    await createIndex({\n        client: elasticsearch,\n        index,\n        type: FormElasticsearchIndexPlugin.type,\n        tenant,\n        locale,\n        plugins,\n        onExists: () => {\n            console.log(`Elasticsearch index \"${index}\" for the Form Builder already exists.`);\n        },\n        onError: (ex: Error) => {\n            console.error(`Could not create the Form Builder Elasticsearch index \"${index}\".`, ex);\n            return ex;\n        }\n    });\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,6BAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AASO,MAAMG,wBAAwB,GAAG,MAAOC,MAAsC,IAAK;EACtF,MAAM;IAAEC,aAAa;IAAEC,OAAO;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EAEzD,MAAM;IAAEK;EAAM,CAAC,GAAGC,8BAAc,CAACC,EAAE,CAAC;IAChCJ,MAAM;IACNC;EACJ,CAAC,CAAC;EAEF,MAAM,IAAAI,6BAAW,EAAC;IACdC,MAAM,EAAER,aAAa;IACrBI,KAAK;IACLK,IAAI,EAAEC,0DAA4B,CAACD,IAAI;IACvCN,MAAM;IACND,MAAM;IACND,OAAO;IACPU,QAAQ,EAAEA,CAAA,KAAM;MACZC,OAAO,CAACC,GAAG,CAAC,wBAAwBT,KAAK,wCAAwC,CAAC;IACtF,CAAC;IACDU,OAAO,EAAGC,EAAS,IAAK;MACpBH,OAAO,CAACI,KAAK,CAAC,0DAA0DZ,KAAK,IAAI,EAAEW,EAAE,CAAC;MACtF,OAAOA,EAAE;IACb;EACJ,CAAC,CAAC;AACN,CAAC;AAACE,OAAA,CAAAnB,wBAAA,GAAAA,wBAAA","ignoreList":[]}

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,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+var _FormElasticsearchIndexPlugin = require("../../plugins/FormElasticsearchIndexPlugin");
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+const base = exports.base = new _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin({
+  body: (0, _apiElasticsearch.getBaseConfiguration)()
+});
+
+//# sourceMappingURL=base.js.map

package/elasticsearch/indices/base.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_FormElasticsearchIndexPlugin","require","_apiElasticsearch","base","exports","FormElasticsearchIndexPlugin","body","getBaseConfiguration"],"sources":["base.ts"],"sourcesContent":["import { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\nimport { getBaseConfiguration } from \"@webiny/api-elasticsearch\";\n\nexport const base = new FormElasticsearchIndexPlugin({\n    body: getBaseConfiguration()\n});\n"],"mappings":";;;;;;AAAA,IAAAA,6BAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAEO,MAAME,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG,IAAIE,0DAA4B,CAAC;EACjDC,IAAI,EAAE,IAAAC,sCAAoB,EAAC;AAC/B,CAAC,CAAC","ignoreList":[]}

package/elasticsearch/indices/index.d.ts

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

package/elasticsearch/indices/index.js

@@ -0,0 +1,14 @@
+"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;
+
+//# sourceMappingURL=index.js.map

package/elasticsearch/indices/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_base","require","_japanese","elasticsearchIndexPlugins","base","japanese","exports"],"sources":["index.ts"],"sourcesContent":["import { base } from \"./base\";\nimport { japanese } from \"./japanese\";\n\nexport const elasticsearchIndexPlugins = () => {\n    return [base, japanese];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEO,MAAME,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CAACC,UAAI,EAAEC,kBAAQ,CAAC;AAC3B,CAAC;AAACC,OAAA,CAAAH,yBAAA,GAAAA,yBAAA","ignoreList":[]}

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,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.japanese = void 0;
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+var _FormElasticsearchIndexPlugin = require("../../plugins/FormElasticsearchIndexPlugin");
+const japanese = exports.japanese = new _FormElasticsearchIndexPlugin.FormElasticsearchIndexPlugin({
+  body: (0, _apiElasticsearch.getJapaneseConfiguration)(),
+  locales: ["ja", "ja-jp"]
+});
+
+//# sourceMappingURL=japanese.js.map

package/elasticsearch/indices/japanese.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiElasticsearch","require","_FormElasticsearchIndexPlugin","japanese","exports","FormElasticsearchIndexPlugin","body","getJapaneseConfiguration","locales"],"sources":["japanese.ts"],"sourcesContent":["import { getJapaneseConfiguration } from \"@webiny/api-elasticsearch\";\nimport { FormElasticsearchIndexPlugin } from \"~/plugins/FormElasticsearchIndexPlugin\";\n\nexport const japanese = new FormElasticsearchIndexPlugin({\n    body: getJapaneseConfiguration(),\n    locales: [\"ja\", \"ja-jp\"]\n});\n"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,6BAAA,GAAAD,OAAA;AAEO,MAAME,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAG,IAAIE,0DAA4B,CAAC;EACrDC,IAAI,EAAE,IAAAC,0CAAwB,EAAC,CAAC;EAChCC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO;AAC3B,CAAC,CAAC","ignoreList":[]}

package/index.d.ts

@@ -1,2 +1,3 @@
-import { FormBuilderStorageOperationsFactory } from "./types";
+import type { FormBuilderStorageOperationsFactory } from "./types";
+export * from "./plugins";
 export declare const createFormBuilderStorageOperations: FormBuilderStorageOperationsFactory;

package/index.js

@@ -1,107 +1,91 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  createFormBuilderStorageOperations: true
+};
 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");
-
 var _submission = require("./definitions/submission");
-
 var _system = require("./definitions/system");
-
 var _settings = require("./definitions/settings");
-
 var _system2 = require("./operations/system");
-
 var _submission2 = require("./operations/submission");
-
 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"));
-
-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");
+var _indices = require("./elasticsearch/indices");
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
+var _plugins2 = require("./plugins");
+Object.keys(_plugins2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugins2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugins2[key];
+    }
+  });
+});
+var _createIndexTaskPlugin = require("./tasks/createIndexTaskPlugin");
+var _api = require("@webiny/api");
 const reservedFields = ["PK", "SK", "index", "data", "TYPE", "__type", "GSI1_PK", "GSI1_SK"];
-
 const isReserved = name => {
   if (reservedFields.includes(name) === false) {
     return;
   }
-
   throw new _error.default(`Attribute name "${name}" is not allowed.`, "ATTRIBUTE_NOT_ALLOWED", {
     name
   });
 };
-
 const createFormBuilderStorageOperations = params => {
   const {
-    attributes = {},
+    attributes,
     table: tableName,
     esTable: esTableName,
     documentClient,
     elasticsearch,
-    plugins: pluginsInput
+    plugins: userPlugins
   } = params;
-
   if (attributes) {
     Object.values(attributes).forEach(attrs => {
       Object.keys(attrs).forEach(isReserved);
     });
   }
-
   const plugins = new _plugins.PluginsContainer([
   /**
    * 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.
    */
   (0, _filters.default)(),
   /**
-   * Elasticsearch operators.
+   * Built-in Elasticsearch index plugins
    */
-  (0, _operators.getElasticsearchOperators)()]);
+  (0, _indices.elasticsearchIndexPlugins)()]);
   const table = (0, _table.createTable)({
     tableName,
     documentClient
@@ -117,72 +101,107 @@ 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] : {}
     }),
-
     /**
      * Elasticsearch entities.
      */
     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 {
+    beforeInit: async context => {
+      context.db.registry.register({
+        item: entities.form,
+        app: "fb",
+        tags: ["regular", "form", entities.form.name]
+      });
+      context.db.registry.register({
+        item: entities.esForm,
+        app: "fb",
+        tags: ["es", "form", entities.esForm.name]
+      });
+      context.db.registry.register({
+        item: entities.submission,
+        app: "fb",
+        tags: ["regular", "form-submission", entities.submission.name]
+      });
+      context.db.registry.register({
+        item: entities.esSubmission,
+        app: "fb",
+        tags: ["es", "form-submission", entities.esSubmission.name]
+      });
+      const types = [_apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type,
+      // Form Builder
+      _plugins2.FormDynamoDbFieldPlugin.type, _plugins2.FormElasticsearchBodyModifierPlugin.type, _plugins2.FormElasticsearchFieldPlugin.type, _plugins2.FormElasticsearchIndexPlugin.type, _plugins2.FormElasticsearchQueryModifierPlugin.type, _plugins2.FormElasticsearchSortModifierPlugin.type, _plugins2.SubmissionElasticsearchBodyModifierPlugin.type, _plugins2.SubmissionElasticsearchFieldPlugin.type, _plugins2.SubmissionElasticsearchQueryModifierPlugin.type, _plugins2.SubmissionElasticsearchSortModifierPlugin.type, _api.CompressorPlugin.type];
+      for (const type of types) {
+        plugins.mergeByType(context.plugins, type);
+      }
+      context.plugins.register([(0, _createIndexTaskPlugin.createIndexTaskPlugin)(), (0, _indices.elasticsearchIndexPlugins)()]);
+    },
+    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)(),
     getTable: () => table,
     getEsTable: () => esTable,
-    getEntities: () => entities
-  }, (0, _system2.createSystemStorageOperations)({
-    table,
-    entity: entities.system
-  })), (0, _settings2.createSettingsStorageOperations)({
-    table,
-    entity: entities.settings
-  })), (0, _form2.createFormStorageOperations)({
-    elasticsearch,
-    table,
-    entity: entities.form,
-    esEntity: entities.esForm,
-    plugins
-  })), (0, _submission2.createSubmissionStorageOperations)({
-    elasticsearch,
-    table,
-    entity: entities.submission,
-    esEntity: entities.esSubmission,
-    plugins
-  }));
+    getEntities: () => entities,
+    ...(0, _system2.createSystemStorageOperations)({
+      table,
+      entity: entities.system
+    }),
+    ...(0, _settings2.createSettingsStorageOperations)({
+      table,
+      entity: entities.settings
+    }),
+    ...(0, _form2.createFormStorageOperations)({
+      elasticsearch,
+      table,
+      entity: entities.form,
+      esEntity: entities.esForm,
+      plugins
+    }),
+    ...(0, _submission2.createSubmissionStorageOperations)({
+      elasticsearch,
+      table,
+      entity: entities.submission,
+      esEntity: entities.esSubmission,
+      plugins
+    })
+  };
 };
+exports.createFormBuilderStorageOperations = createFormBuilderStorageOperations;
 
-exports.createFormBuilderStorageOperations = createFormBuilderStorageOperations;
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_filters","_interopRequireDefault","require","_elasticsearchFields","_elasticsearchFields2","_error","_types","_table","_form","_submission","_system","_settings","_system2","_submission2","_settings2","_form2","_tableElasticsearch","_plugins","_elasticsearch","_apiElasticsearch","_indices","_createElasticsearchIndex","_plugins2","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_createIndexTaskPlugin","_api","reservedFields","isReserved","name","includes","WebinyError","createFormBuilderStorageOperations","params","attributes","table","tableName","esTable","esTableName","documentClient","elasticsearch","plugins","userPlugins","values","attrs","PluginsContainer","submissionElasticsearchFields","formElasticsearchFields","dynamoDbValueFilters","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","beforeInit","context","db","registry","register","item","app","tags","types","ElasticsearchQueryBuilderOperatorPlugin","type","FormDynamoDbFieldPlugin","FormElasticsearchBodyModifierPlugin","FormElasticsearchFieldPlugin","FormElasticsearchIndexPlugin","FormElasticsearchQueryModifierPlugin","FormElasticsearchSortModifierPlugin","SubmissionElasticsearchBodyModifierPlugin","SubmissionElasticsearchFieldPlugin","SubmissionElasticsearchQueryModifierPlugin","SubmissionElasticsearchSortModifierPlugin","CompressorPlugin","mergeByType","createIndexTaskPlugin","init","i18n","locales","onLocaleBeforeCreate","subscribe","locale","tenant","createElasticsearchIndex","code","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 type { FormBuilderStorageOperationsFactory } from \"~/types\";\nimport { 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 { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch\";\nimport { elasticsearchIndexPlugins } from \"~/elasticsearch/indices\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\nimport type { FormBuilderContext } from \"@webiny/api-form-builder/types\";\nimport {\n    FormDynamoDbFieldPlugin,\n    FormElasticsearchBodyModifierPlugin,\n    FormElasticsearchFieldPlugin,\n    FormElasticsearchIndexPlugin,\n    FormElasticsearchQueryModifierPlugin,\n    FormElasticsearchSortModifierPlugin,\n    SubmissionElasticsearchBodyModifierPlugin,\n    SubmissionElasticsearchFieldPlugin,\n    SubmissionElasticsearchQueryModifierPlugin,\n    SubmissionElasticsearchSortModifierPlugin\n} from \"~/plugins\";\nimport { createIndexTaskPlugin } from \"~/tasks/createIndexTaskPlugin\";\nimport { CompressorPlugin } from \"@webiny/api\";\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 * from \"./plugins\";\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         * 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        beforeInit: async (context: FormBuilderContext) => {\n            context.db.registry.register({\n                item: entities.form,\n                app: \"fb\",\n                tags: [\"regular\", \"form\", entities.form.name]\n            });\n            context.db.registry.register({\n                item: entities.esForm,\n                app: \"fb\",\n                tags: [\"es\", \"form\", entities.esForm.name]\n            });\n            context.db.registry.register({\n                item: entities.submission,\n                app: \"fb\",\n                tags: [\"regular\", \"form-submission\", entities.submission.name]\n            });\n            context.db.registry.register({\n                item: entities.esSubmission,\n                app: \"fb\",\n                tags: [\"es\", \"form-submission\", entities.esSubmission.name]\n            });\n\n            const types: string[] = [\n                ElasticsearchQueryBuilderOperatorPlugin.type,\n                // Form Builder\n                FormDynamoDbFieldPlugin.type,\n                FormElasticsearchBodyModifierPlugin.type,\n                FormElasticsearchFieldPlugin.type,\n                FormElasticsearchIndexPlugin.type,\n                FormElasticsearchQueryModifierPlugin.type,\n                FormElasticsearchSortModifierPlugin.type,\n                SubmissionElasticsearchBodyModifierPlugin.type,\n                SubmissionElasticsearchFieldPlugin.type,\n                SubmissionElasticsearchQueryModifierPlugin.type,\n                SubmissionElasticsearchSortModifierPlugin.type,\n                CompressorPlugin.type\n            ];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            context.plugins.register([createIndexTaskPlugin(), elasticsearchIndexPlugins()]);\n        },\n        init: async (context: FormBuilderContext) => {\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        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":"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","ignoreList":[]}

package/operations/form/elasticsearchBody.d.ts

@@ -1,12 +1,12 @@
-import { SearchBody as esSearchBody } from "elastic-ts";
-import { FormBuilderStorageOperationsListFormsParams } from "@webiny/api-form-builder/types";
-import { PluginsContainer } from "@webiny/plugins";
+import type { PrimitiveValue, SearchBody as esSearchBody } from "elastic-ts";
+import type { FormBuilderStorageOperationsListFormsParams } from "@webiny/api-form-builder/types";
+import type { PluginsContainer } from "@webiny/plugins";
 export declare const createFormElasticType: () => string;
 interface CreateElasticsearchBodyParams {
     plugins: PluginsContainer;
     where: FormBuilderStorageOperationsListFormsParams["where"];
     limit: number;
-    after?: string;
+    after?: PrimitiveValue[];
     sort: string[];
 }
 export declare const createElasticsearchBody: (params: CreateElasticsearchBodyParams) => esSearchBody;

package/operations/form/elasticsearchBody.js

@@ -1,42 +1,18 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormElasticType = exports.createElasticsearchBody = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-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");
-
 var _FormElasticsearchSortModifierPlugin = require("../../plugins/FormElasticsearchSortModifierPlugin");
-
 var _FormElasticsearchBodyModifierPlugin = require("../../plugins/FormElasticsearchBodyModifierPlugin");
-
 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";
 };
-
 exports.createFormElasticType = createFormElasticType;
-
 const createInitialQueryValue = () => {
   return {
     must: [
@@ -53,7 +29,6 @@ const createInitialQueryValue = () => {
     filter: []
   };
 };
-
 const createElasticsearchQuery = params => {
   const {
     plugins,
@@ -64,24 +39,18 @@ 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 = {
+    ...initialWhere
+  };
   /**
    * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.
    *
    * When ES index is shared between tenants, we need to filter records by tenant ID.
    * No need for the tenant filtering otherwise as each index is for single tenant.
    */
-
-
-  const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
-
-  if (sharedIndex) {
+  const sharedIndex = (0, _apiElasticsearch.isSharedElasticsearchIndex)();
+  if (sharedIndex && where.tenant) {
     query.must.push({
       term: {
         "tenant.keyword": where.tenant
@@ -92,13 +61,10 @@ const createElasticsearchQuery = params => {
    * Remove tenant so it is not applied again later.
    * Possibly tenant is not defined, but just in case, remove it.
    */
-
-
   delete where.tenant;
   /**
    * Add the locale to filtering.
    */
-
   query.must.push({
     term: {
       "locale.keyword": where.locale
@@ -108,8 +74,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,
@@ -117,7 +82,6 @@ const createElasticsearchQuery = params => {
   });
   return query;
 };
-
 const createElasticsearchBody = params => {
   const {
     plugins,
@@ -130,58 +94,50 @@ 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({
+    ...params,
     fieldPlugins
-  }));
-  const sort = (0, _sort.createSort)({
+  });
+  const sort = (0, _apiElasticsearch.createSort)({
     sort: initialSort,
     fieldPlugins
   });
   const queryModifiers = plugins.byType(_FormElasticsearchQueryModifierPlugin.FormElasticsearchQueryModifierPlugin.type);
-
   for (const plugin of queryModifiers) {
     plugin.modifyQuery({
       query,
       where
     });
   }
-
   const sortModifiers = plugins.byType(_FormElasticsearchSortModifierPlugin.FormElasticsearchSortModifierPlugin.type);
-
   for (const plugin of sortModifiers) {
     plugin.modifySort({
       sort
     });
   }
-
   const body = {
     query: {
       constant_score: {
         filter: {
-          bool: _objectSpread({}, query)
+          bool: {
+            ...query
+          }
         }
       }
     },
     size: limit + 1,
-
-    /**
-     * Casting as any is required due to search_after is accepting an array of values.
-     * 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: after,
     sort
   };
   const bodyModifiers = plugins.byType(_FormElasticsearchBodyModifierPlugin.FormElasticsearchBodyModifierPlugin.type);
-
   for (const plugin of bodyModifiers) {
     plugin.modifyBody({
       body
     });
   }
-
   return body;
 };
+exports.createElasticsearchBody = createElasticsearchBody;
 
-exports.createElasticsearchBody = createElasticsearchBody;
+//# sourceMappingURL=elasticsearchBody.js.map