webiny · neatbyte-vnobis · Oct 27, 2023 · Nov 1, 2023 · Nov 1, 2023 · Nov 1, 2023
diff --git a/apps/api/pageBuilder/export/combine/package.json b/apps/api/pageBuilder/export/combine/package.json
@@ -8,6 +8,8 @@
   "dependencies": {
     "@webiny/api-form-builder": "0.0.0",
     "@webiny/api-form-builder-so-ddb": "0.0.0",
+    "@webiny/api-headless-cms": "0.0.0",
+    "@webiny/api-headless-cms-ddb": "0.0.0",
     "@webiny/api-i18n": "0.0.0",
     "@webiny/api-i18n-content": "0.0.0",
     "@webiny/api-i18n-ddb": "0.0.0",

diff --git a/apps/api/pageBuilder/export/combine/src/index.ts b/apps/api/pageBuilder/export/combine/src/index.ts
@@ -3,6 +3,8 @@ import { createHandler } from "@webiny/handler-aws/raw";
 import i18nPlugins from "@webiny/api-i18n/graphql";
 import i18nDynamoDbStorageOperations from "@webiny/api-i18n-ddb";
 import i18nContentPlugins from "@webiny/api-i18n-content/plugins";
+import { CmsParametersPlugin, createHeadlessCmsContext } from "@webiny/api-headless-cms";
+import { createStorageOperations as createHeadlessCmsStorageOperations } from "@webiny/api-headless-cms-ddb";
 import { createFormBuilder } from "@webiny/api-form-builder";
 import { createFormBuilderStorageOperations } from "@webiny/api-form-builder-so-ddb";
 import {
@@ -37,6 +39,18 @@ export const handler = createHandler({
         i18nPlugins(),
         i18nDynamoDbStorageOperations(),
         i18nContentPlugins(),
+        new CmsParametersPlugin(async context => {
+            const locale = context.i18n.getCurrentLocale("content")?.code || "en-US";
+            return {
+                type: "manage",
+                locale
+            };
+        }),
+        createHeadlessCmsContext({
+            storageOperations: createHeadlessCmsStorageOperations({
+                documentClient
+            })
+        }),
         createPageBuilderContext({
             storageOperations: createPageBuilderStorageOperations({
                 documentClient

diff --git a/apps/api/pageBuilder/export/combine/tsconfig.json b/apps/api/pageBuilder/export/combine/tsconfig.json
@@ -4,6 +4,8 @@
   "references": [
     { "path": "../../../../../packages/api-form-builder/tsconfig.build.json" },
     { "path": "../../../../../packages/api-form-builder-so-ddb/tsconfig.build.json" },
+    { "path": "../../../../../packages/api-headless-cms/tsconfig.build.json" },
+    { "path": "../../../../../packages/api-headless-cms-ddb/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n-content/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n-ddb/tsconfig.build.json" },
@@ -30,6 +32,10 @@
         "../../../../../packages/api-form-builder-so-ddb/src/*"
       ],
       "@webiny/api-form-builder-so-ddb": ["../../../../../packages/api-form-builder-so-ddb/src"],
+      "@webiny/api-headless-cms/*": ["../../../../../packages/api-headless-cms/src/*"],
+      "@webiny/api-headless-cms": ["../../../../../packages/api-headless-cms/src"],
+      "@webiny/api-headless-cms-ddb/*": ["../../../../../packages/api-headless-cms-ddb/src/*"],
+      "@webiny/api-headless-cms-ddb": ["../../../../../packages/api-headless-cms-ddb/src"],
       "@webiny/api-i18n/*": ["../../../../../packages/api-i18n/src/*"],
       "@webiny/api-i18n": ["../../../../../packages/api-i18n/src"],
       "@webiny/api-i18n-content/*": ["../../../../../packages/api-i18n-content/src/*"],

diff --git a/apps/api/pageBuilder/import/create/package.json b/apps/api/pageBuilder/import/create/package.json
@@ -8,6 +8,8 @@
   "dependencies": {
     "@webiny/api-form-builder": "0.0.0",
     "@webiny/api-form-builder-so-ddb": "0.0.0",
+    "@webiny/api-headless-cms": "0.0.0",
+    "@webiny/api-headless-cms-ddb": "0.0.0",
     "@webiny/api-i18n": "0.0.0",
     "@webiny/api-i18n-content": "0.0.0",
     "@webiny/api-i18n-ddb": "0.0.0",

diff --git a/apps/api/pageBuilder/import/create/src/index.ts b/apps/api/pageBuilder/import/create/src/index.ts
@@ -3,6 +3,8 @@ import { createHandler } from "@webiny/handler-aws/raw";
 import i18nPlugins from "@webiny/api-i18n/graphql";
 import i18nDynamoDbStorageOperations from "@webiny/api-i18n-ddb";
 import i18nContentPlugins from "@webiny/api-i18n-content/plugins";
+import { CmsParametersPlugin, createHeadlessCmsContext } from "@webiny/api-headless-cms";
+import { createStorageOperations as createHeadlessCmsStorageOperations } from "@webiny/api-headless-cms-ddb";
 import { createFormBuilder } from "@webiny/api-form-builder";
 import { createFormBuilderStorageOperations } from "@webiny/api-form-builder-so-ddb";
 import {
@@ -35,6 +37,18 @@ export const handler = createHandler({
         i18nPlugins(),
         i18nDynamoDbStorageOperations(),
         i18nContentPlugins(),
+        new CmsParametersPlugin(async context => {
+            const locale = context.i18n.getCurrentLocale("content")?.code || "en-US";
+            return {
+                type: "manage",
+                locale
+            };
+        }),
+        createHeadlessCmsContext({
+            storageOperations: createHeadlessCmsStorageOperations({
+                documentClient
+            })
+        }),
         createPageBuilderContext({
             storageOperations: createPageBuilderStorageOperations({
                 documentClient

diff --git a/apps/api/pageBuilder/import/create/tsconfig.json b/apps/api/pageBuilder/import/create/tsconfig.json
@@ -4,6 +4,8 @@
   "references": [
     { "path": "../../../../../packages/api-form-builder/tsconfig.build.json" },
     { "path": "../../../../../packages/api-form-builder-so-ddb/tsconfig.build.json" },
+    { "path": "../../../../../packages/api-headless-cms/tsconfig.build.json" },
+    { "path": "../../../../../packages/api-headless-cms-ddb/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n-content/tsconfig.build.json" },
     { "path": "../../../../../packages/api-i18n-ddb/tsconfig.build.json" },
@@ -30,6 +32,10 @@
         "../../../../../packages/api-form-builder-so-ddb/src/*"
       ],
       "@webiny/api-form-builder-so-ddb": ["../../../../../packages/api-form-builder-so-ddb/src"],
+      "@webiny/api-headless-cms/*": ["../../../../../packages/api-headless-cms/src/*"],
+      "@webiny/api-headless-cms": ["../../../../../packages/api-headless-cms/src"],
+      "@webiny/api-headless-cms-ddb/*": ["../../../../../packages/api-headless-cms-ddb/src/*"],
+      "@webiny/api-headless-cms-ddb": ["../../../../../packages/api-headless-cms-ddb/src"],
       "@webiny/api-i18n/*": ["../../../../../packages/api-i18n/src/*"],
       "@webiny/api-i18n": ["../../../../../packages/api-i18n/src"],
       "@webiny/api-i18n-content/*": ["../../../../../packages/api-i18n-content/src/*"],

diff --git a/packages/api-form-builder-so-ddb-es/package.json b/packages/api-form-builder-so-ddb-es/package.json
@@ -34,7 +34,6 @@
     "@webiny/db-dynamodb": "0.0.0",
     "@webiny/error": "0.0.0",
     "@webiny/plugins": "0.0.0",
-    "@webiny/utils": "0.0.0",
     "elastic-ts": "^0.8.0"
   },
   "devDependencies": {

diff --git a/packages/api-form-builder-so-ddb-es/src/definitions/form.ts b/packages/api-form-builder-so-ddb-es/src/definitions/form.ts
@@ -73,9 +73,6 @@ export const createFormEntity = (params: Params): Entity<any> => {
             steps: {
                 type: "list"
             },
-            stats: {
-                type: "map"
-            },
             settings: {
                 type: "map"
             },

diff --git a/packages/api-form-builder-so-ddb-es/src/index.ts b/packages/api-form-builder-so-ddb-es/src/index.ts
@@ -1,40 +1,16 @@
-import dynamoDbValueFilters from "@webiny/db-dynamodb/plugins/filters";
-import formElasticsearchFields from "./operations/form/elasticsearchFields";
-import submissionElasticsearchFields from "./operations/submission/elasticsearchFields";
 import WebinyError from "@webiny/error";
-import { ENTITIES, FormBuilderStorageOperationsFactory } from "~/types";
+import { FormBuilderStorageOperationsFactory, ENTITIES, FormBuilderContext } from "~/types";
 import { createTable } from "~/definitions/table";
-import { createFormEntity } from "~/definitions/form";
-import { createSubmissionEntity } from "~/definitions/submission";
 import { createSystemEntity } from "~/definitions/system";
 import { createSettingsEntity } from "~/definitions/settings";
 import { createSystemStorageOperations } from "~/operations/system";
 import { createSubmissionStorageOperations } from "~/operations/submission";
 import { createSettingsStorageOperations } from "~/operations/settings";
 import { createFormStorageOperations } from "~/operations/form";
+import { createFormStatsStorageOperations } from "~/operations/formStats";
 import { createElasticsearchTable } from "~/definitions/tableElasticsearch";
-import { PluginsContainer } from "@webiny/plugins";
-import { createElasticsearchEntity } from "~/definitions/elasticsearch";
-import {
-    CompressionPlugin,
-    ElasticsearchQueryBuilderOperatorPlugin
-} from "@webiny/api-elasticsearch";
-import { elasticsearchIndexPlugins } from "~/elasticsearch/indices";
-import { createElasticsearchIndex } from "~/elasticsearch/createElasticsearchIndex";
-import { FormBuilderContext } from "@webiny/api-form-builder/types";
-import {
-    FormDynamoDbFieldPlugin,
-    FormElasticsearchBodyModifierPlugin,
-    FormElasticsearchFieldPlugin,
-    FormElasticsearchIndexPlugin,
-    FormElasticsearchQueryModifierPlugin,
-    FormElasticsearchSortModifierPlugin,
-    SubmissionElasticsearchBodyModifierPlugin,
-    SubmissionElasticsearchFieldPlugin,
-    SubmissionElasticsearchQueryModifierPlugin,
-    SubmissionElasticsearchSortModifierPlugin
-} from "~/plugins";
 import { createIndexTaskPlugin } from "~/tasks/createIndexTaskPlugin";
+import { elasticsearchIndexPlugins } from "~/elasticsearch/indices";
 
 const reservedFields = ["PK", "SK", "index", "data", "TYPE", "__type", "GSI1_PK", "GSI1_SK"];
 
@@ -50,44 +26,14 @@ const isReserved = (name: string): void => {
 export * from "./plugins";
 
 export const createFormBuilderStorageOperations: FormBuilderStorageOperationsFactory = params => {
-    const {
-        attributes,
-        table: tableName,
-        esTable: esTableName,
-        documentClient,
-        elasticsearch,
-        plugins: userPlugins
-    } = params;
+    const { attributes, table: tableName, esTable: esTableName, documentClient } = params;
 
     if (attributes) {
         Object.values(attributes).forEach(attrs => {
             Object.keys(attrs).forEach(isReserved);
         });
     }
 
-    const plugins = new PluginsContainer([
-        /**
-         * User defined plugins.
-         */
-        userPlugins || [],
-        /**
-         * Elasticsearch field definitions for the submission record.
-         */
-        submissionElasticsearchFields(),
-        /**
-         * Elasticsearch field definitions for the form record.
-         */
-        formElasticsearchFields(),
-        /**
-         * DynamoDB filter plugins for the where conditions.
-         */
-        dynamoDbValueFilters(),
-        /**
-         * Built-in Elasticsearch index plugins
-         */
-        elasticsearchIndexPlugins()
-    ]);
-
     const table = createTable({
         tableName,
         documentClient
@@ -102,16 +48,6 @@ export const createFormBuilderStorageOperations: FormBuilderStorageOperationsFac
         /**
          * Regular entities.
          */
-        form: createFormEntity({
-            entityName: ENTITIES.FORM,
-            table,
-            attributes: attributes ? attributes[ENTITIES.FORM] : {}
-        }),
-        submission: createSubmissionEntity({
-            entityName: ENTITIES.SUBMISSION,
-            table,
-            attributes: attributes ? attributes[ENTITIES.SUBMISSION] : {}
-        }),
         system: createSystemEntity({
             entityName: ENTITIES.SYSTEM,
             table,
@@ -121,55 +57,13 @@ export const createFormBuilderStorageOperations: FormBuilderStorageOperationsFac
             entityName: ENTITIES.SETTINGS,
             table,
             attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}
-        }),
-        /**
-         * Elasticsearch entities.
-         */
-        esForm: createElasticsearchEntity({
-            entityName: ENTITIES.ES_FORM,
-            table: esTable,
-            attributes: attributes ? attributes[ENTITIES.ES_FORM] : {}
-        }),
-        esSubmission: createElasticsearchEntity({
-            entityName: ENTITIES.ES_SUBMISSION,
-            table: esTable,
-            attributes: attributes ? attributes[ENTITIES.ES_SUBMISSION] : {}
         })
     };
 
     return {
         beforeInit: async (context: FormBuilderContext) => {
-            const types: string[] = [
-                // Elasticsearch
-                CompressionPlugin.type,
-                ElasticsearchQueryBuilderOperatorPlugin.type,
-                // Form Builder
-                FormDynamoDbFieldPlugin.type,
-                FormElasticsearchBodyModifierPlugin.type,
-                FormElasticsearchFieldPlugin.type,
-                FormElasticsearchIndexPlugin.type,
-                FormElasticsearchQueryModifierPlugin.type,
-                FormElasticsearchSortModifierPlugin.type,
-                SubmissionElasticsearchBodyModifierPlugin.type,
-                SubmissionElasticsearchFieldPlugin.type,
-                SubmissionElasticsearchQueryModifierPlugin.type,
-                SubmissionElasticsearchSortModifierPlugin.type
-            ];
-            for (const type of types) {
-                plugins.mergeByType(context.plugins, type);
-            }
             context.plugins.register([createIndexTaskPlugin(), elasticsearchIndexPlugins()]);
         },
-        init: async (context: FormBuilderContext) => {
-            context.i18n.locales.onLocaleBeforeCreate.subscribe(async ({ locale, tenant }) => {
-                await createElasticsearchIndex({
-                    elasticsearch,
-                    plugins,
-                    tenant,
-                    locale: locale.code
-                });
-            });
-        },
         getTable: () => table,
         getEsTable: () => esTable,
         getEntities: () => entities,
@@ -181,19 +75,8 @@ export const createFormBuilderStorageOperations: FormBuilderStorageOperationsFac
             table,
             entity: entities.settings
         }),
-        ...createFormStorageOperations({
-            elasticsearch,
-            table,
-            entity: entities.form,
-            esEntity: entities.esForm,
-            plugins
-        }),
-        ...createSubmissionStorageOperations({
-            elasticsearch,
-            table,
-            entity: entities.submission,
-            esEntity: entities.esSubmission,
-            plugins
-        })
+        forms: createFormStorageOperations(),
+        formStats: createFormStatsStorageOperations(),
+        submissions: createSubmissionStorageOperations()
     };
 };